From: Joel Holdsworth <redacted>
Date: Sun, 31 Mar 2013 17:57:38 +0000 (+0100)
Subject: Ignore H-scroll events while scrollbar is begin updated.
X-Git-Tag: pulseview-0.1.0~58
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=528bd8a194362b7e73d53360ec78ec22f06eecc2;p=pulseview.git

Ignore H-scroll events while scrollbar is begin updated.

This is an alternative approach to resolving bug 7.
---

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 34676334..0f9edb3f 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -70,6 +70,7 @@ 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))),
@@ -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,
@@ -290,6 +295,9 @@ void View::resizeEvent(QResizeEvent*)
 
 void View::h_scroll_value_changed(int value)
 {
+	if (_updating_scroll)
+		return;
+
 	const int range = horizontalScrollBar()->maximum();
 	if (range < MaxScrollValue)
 		_offset = _scale * value;
diff --git a/pv/view/view.h b/pv/view/view.h
index 5a10ee9e..980ccf1f 100644
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -154,6 +154,7 @@ private:
 	double _offset;
 
 	int _v_offset;
+	bool _updating_scroll;
 
 	bool _show_cursors;
 	std::pair<Cursor, Cursor> _cursors;