X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=0f9edb3f39719d53a2d991f2a25383e89386e0e6;hb=528bd8a194362b7e73d53360ec78ec22f06eecc2;hp=b52d689f22c12d988ef3d2f56499bc0b3e9f4629;hpb=149e359e48ede480f3734cfc5c04bd1399d0d4be;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index b52d689..0f9edb3 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -70,13 +70,14 @@ View::View(SigSession &session, QWidget *parent) :
 	_scale(1e-6),
 	_offset(0),
 	_v_offset(0),
+	_updating_scroll(false),
 	_show_cursors(false),
 	_cursors(pair<Cursor, Cursor>(Cursor(*this, 0.0),
 		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)));
 
@@ -210,6 +211,8 @@ void View::update_scroll()
 
 	horizontalScrollBar()->setPageStep(areaSize.width());
 
+	_updating_scroll = true;
+
 	if (length < MaxScrollValue) {
 		horizontalScrollBar()->setRange(0, length);
 		horizontalScrollBar()->setSliderPosition(offset);
@@ -219,6 +222,8 @@ void View::update_scroll()
 			_offset * MaxScrollValue / (_scale * length));
 	}
 
+	_updating_scroll = false;
+
 	// Set the vertical scrollbar
 	verticalScrollBar()->setPageStep(areaSize.height());
 	verticalScrollBar()->setRange(0,
@@ -288,8 +293,11 @@ void View::resizeEvent(QResizeEvent*)
 	update_scroll();
 }
 
-void View::h_scroll_moved(int value)
+void View::h_scroll_value_changed(int value)
 {
+	if (_updating_scroll)
+		return;
+
 	const int range = horizontalScrollBar()->maximum();
 	if (range < MaxScrollValue)
 		_offset = _scale * value;