From b16907d341861d227d6d2db3014ee36a2af4b619 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Sun, 31 Mar 2013 18:30:50 +0100 Subject: [PATCH] Revert "View: Decouple horizontal scrolling from the scoll bar" This reverts commit 149e359e48ede480f3734cfc5c04bd1399d0d4be. The original commit fixed the scrolling jitter at high zoom, but breaks scrollbar paging behaviour. --- pv/view/view.cpp | 6 +++--- pv/view/view.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pv/view/view.cpp b/pv/view/view.cpp index b52d689f..34676334 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -75,8 +75,8 @@ View::View(SigSession &session, QWidget *parent) : Cursor(*this, 1.0))), _hover_point(-1, -1) { - connect(horizontalScrollBar(), SIGNAL(sliderMoved(int)), - this, SLOT(h_scroll_moved(int))); + connect(horizontalScrollBar(), SIGNAL(valueChanged(int)), + this, SLOT(h_scroll_value_changed(int))); connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(v_scroll_value_changed(int))); @@ -288,7 +288,7 @@ void View::resizeEvent(QResizeEvent*) update_scroll(); } -void View::h_scroll_moved(int value) +void View::h_scroll_value_changed(int value) { const int range = horizontalScrollBar()->maximum(); if (range < MaxScrollValue) diff --git a/pv/view/view.h b/pv/view/view.h index dd0ad6ca..5a10ee9e 100644 --- a/pv/view/view.h +++ b/pv/view/view.h @@ -128,7 +128,7 @@ private: private slots: - void h_scroll_moved(int value); + void h_scroll_value_changed(int value); void v_scroll_value_changed(int value); void signals_changed(); -- 2.30.2