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.

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index b52d689f22c12d988ef3d2f56499bc0b3e9f4629..34676334dc67867ba9b17fa064498232693e74e0 100644 (file)
--- 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)
 {
                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)));
 
        connect(verticalScrollBar(), SIGNAL(valueChanged(int)),
                this, SLOT(v_scroll_value_changed(int)));
 


@@ -288,7 +288,7 @@ void View::resizeEvent(QResizeEvent*)
        update_scroll();
 }
 
        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)
 {
        const int range = horizontalScrollBar()->maximum();
        if (range < MaxScrollValue)

diff --git a/pv/view/view.h b/pv/view/view.h
index dd0ad6ca9a2c0c9e2b3b66fb4867e9f55c028d30..5a10ee9ecea7be2b9dacd69c6bb964d0a215de23 100644 (file)
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -128,7 +128,7 @@ private:
 
 private slots:
 
 
 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();
        void v_scroll_value_changed(int value);
 
        void signals_changed();