diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2021-01-03 13:56:43 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2021-01-05 08:24:25 +0000 |
| commit | ee43965024b1fec80ec40df13d1ff95056b5c60d (patch) | |
| tree | 30c1edb9b615c8fd2027374053c170ad30d8921a /ui | |
| parent | c57c3067629347f0933a84ac8f19c53abb2f6a09 (diff) | |
Qt: Fetch OverlayScrollBar sliderPosition from the real ScrollBar
In OverlayScrollBar return the real ScrollBar sliderPosition to ensure
the correct value is used when handling the actionTriggered signal in
vScrollBarActionTriggered().
This improves turning on and off auto scroll during capture when page
stepping using the packet list slider, because the value is propagated
after this signal.
(cherry picked from commit 7980f25f999a39ca3cebd8e6c2f8b17818774ebe)
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/packet_list.cpp | 2 | ||||
| -rw-r--r-- | ui/qt/widgets/overlay_scroll_bar.cpp | 5 | ||||
| -rw-r--r-- | ui/qt/widgets/overlay_scroll_bar.h | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp index 9802bb5a23..a736b85b7b 100644 --- a/ui/qt/packet_list.cpp +++ b/ui/qt/packet_list.cpp @@ -1830,7 +1830,7 @@ void PacketList::vScrollBarActionTriggered(int) { // If we're scrolling with a mouse wheel or trackpad sliderPosition can end up // past the end. - tail_at_end_ = (verticalScrollBar()->sliderPosition() >= verticalScrollBar()->maximum()); + tail_at_end_ = (overlay_sb_->sliderPosition() >= overlay_sb_->maximum()); scrollViewChanged(tail_at_end_); } diff --git a/ui/qt/widgets/overlay_scroll_bar.cpp b/ui/qt/widgets/overlay_scroll_bar.cpp index 0891008e4b..50027e4e65 100644 --- a/ui/qt/widgets/overlay_scroll_bar.cpp +++ b/ui/qt/widgets/overlay_scroll_bar.cpp @@ -94,6 +94,11 @@ QSize OverlayScrollBar::sizeHint() const QScrollBar::sizeHint().height()); } +int OverlayScrollBar::sliderPosition() +{ + return child_sb_.sliderPosition(); +} + void OverlayScrollBar::setNearOverlayImage(QImage &overlay_image, int packet_count, int start_pos, int end_pos, QList<int> positions) { int old_width = packet_map_img_.width(); diff --git a/ui/qt/widgets/overlay_scroll_bar.h b/ui/qt/widgets/overlay_scroll_bar.h index e65e4549dd..37edff523e 100644 --- a/ui/qt/widgets/overlay_scroll_bar.h +++ b/ui/qt/widgets/overlay_scroll_bar.h @@ -22,6 +22,7 @@ public: virtual ~OverlayScrollBar(); virtual QSize sizeHint() const; + virtual int sliderPosition(); /** Set the "near" overlay image. * @param overlay_image An image containing a 1:1 mapping of nearby |