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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 10f6613..0f9edb3 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,
@@ -228,7 +233,7 @@ void View::update_scroll()
 
 void View::reset_signal_layout()
 {
-	int offset = SignalMargin;
+	int offset = SignalMargin + SignalHeight;
 	const vector< shared_ptr<Signal> > sigs(_session.get_signals());
 	BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
 		s->set_v_offset(offset);
@@ -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;