aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/widgets
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2018-01-30 14:59:35 -0800
committerAnders Broman <a.broman58@gmail.com>2018-01-31 04:54:36 +0000
commit47e1798762478ae19354297e5a95d46487cafd42 (patch)
treecbce2a3fd69d82cd935a59ea15d60b9bd7afdb08 /ui/qt/widgets
parent55e74ba841126797b2a5b82142fb1db8f61a1288 (diff)
Qt: Byte view and proto tree fixes.
Select our byte field only when we enter marked / locked mode. Emit fieldSelected from autoScrollTo so that we always set the marked protocol. Don't clobber the current index in saveSelectedField. Change-Id: I967b20608f991a5f3e6a0979b1f702f874ce27b4 Reviewed-on: https://code.wireshark.org/review/25521 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/widgets')
-rw-r--r--ui/qt/widgets/byte_view_text.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/qt/widgets/byte_view_text.cpp b/ui/qt/widgets/byte_view_text.cpp
index 81c2313cf7..ed16261391 100644
--- a/ui/qt/widgets/byte_view_text.cpp
+++ b/ui/qt/widgets/byte_view_text.cpp
@@ -265,14 +265,16 @@ void ByteViewText::mousePressEvent (QMouseEvent *event) {
}
if (marked_byte_offset_ < 0) {
+ // Marked mode.
marked_byte_offset_ = byteOffsetAtPixel(event->pos());
hovered_byte_offset_ = -1;
+ emit byteSelected(marked_byte_offset_);
+ viewport()->update();
} else {
+ // Back to hover mode.
marked_byte_offset_ = -1;
mouseMoveEvent(event);
}
- emit byteSelected(marked_byte_offset_);
- viewport()->update();
}
void ByteViewText::mouseMoveEvent(QMouseEvent *event)