X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=9c793bb8e635c4443c7b762186f1969df0752886;hb=199441e4fe68f1ee45f3d4b7617a7166a87c7926;hp=10f6613c55da3fd2f362e51c67ff365a708b4359;hpb=e314eca490a09eec9ee851787f6e8c28805a81fd;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 10f6613c..9c793bb8 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -70,9 +70,9 @@ 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))),
+	_cursors(*this),
 	_hover_point(-1, -1)
 {
 	connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
@@ -85,9 +85,9 @@ View::View(SigSession &session, QWidget *parent) :
 	connect(&_session, SIGNAL(data_updated()),
 		this, SLOT(data_updated()));
 
-	connect(&_cursors.first, SIGNAL(time_changed()),
+	connect(&_cursors.first(), SIGNAL(time_changed()),
 		this, SLOT(marker_time_changed()));
-	connect(&_cursors.second, SIGNAL(time_changed()),
+	connect(&_cursors.second(), SIGNAL(time_changed()),
 		this, SLOT(marker_time_changed()));
 
 	connect(_header, SIGNAL(signals_moved()),
@@ -161,7 +161,7 @@ void View::show_cursors(bool show)
 	_viewport->update();
 }
 
-std::pair<Cursor, Cursor>& View::cursors()
+CursorPair& View::cursors()
 {
 	return _cursors;
 }
@@ -208,7 +208,9 @@ void View::update_scroll()
 	get_scroll_layout(length, offset);
 	length = max(length - areaSize.width(), 0.0);
 
-	horizontalScrollBar()->setPageStep(areaSize.width());
+	horizontalScrollBar()->setPageStep(areaSize.width() / 2);
+
+	_updating_scroll = true;
 
 	if (length < MaxScrollValue) {
 		horizontalScrollBar()->setRange(0, length);
@@ -219,6 +221,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 +232,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 +294,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;