X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=6cd274b0dc8f74605f480baaadfb61e7a725cfd3;hb=650e2e5fd465119615b9b969d15cc9fb11f18aa4;hp=4575d05e2b7dd0fc58009a4bc927892dbe52a9a3;hpb=5c5ce7574062e0d3ad4f7d9dde70b482315d54fb;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 4575d05e..6cd274b0 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -198,6 +198,7 @@ const Viewport* View::viewport() const
 vector< shared_ptr<TimeItem> > View::time_items() const
 {
 	vector< shared_ptr<TimeItem> > items;
+	items.push_back(cursors_);
 	items.push_back(cursors_->first());
 	items.push_back(cursors_->second());
 	return items;
@@ -482,11 +483,11 @@ void View::update_scroll()
 
 	// Set the vertical scrollbar
 	verticalScrollBar()->setPageStep(areaSize.height());
+	verticalScrollBar()->setSingleStep(areaSize.height() / 8);
 
 	const pair<int, int> extents = v_extents();
-	const int extra_scroll_height = (extents.second - extents.first) / 4;
-	verticalScrollBar()->setRange(extents.first - extra_scroll_height,
-		extents.first + extra_scroll_height);
+	verticalScrollBar()->setRange(extents.first - (areaSize.height() / 2),
+		extents.second - (areaSize.height() / 2));
 }
 
 void View::update_layout()
@@ -505,16 +506,16 @@ void View::update_layout()
 	update_scroll();
 }
 
-void View::paint_label(QPainter &p, int right, bool hover)
+void View::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
 	(void)p;
-	(void)right;
+	(void)rect;
 	(void)hover;
 }
 
-QRectF View::label_rect(int right)
+QRectF View::label_rect(const QRectF &rect)
 {
-	(void)right;
+	(void)rect;
 	return QRectF();
 }
 
@@ -617,8 +618,8 @@ void View::appearance_changed(bool label, bool content)
 void View::extents_changed(bool horz, bool vert)
 {
 	sticky_events_ |=
-		(horz ? SelectableItemHExtentsChanged : 0) |
-		(vert ? SelectableItemVExtentsChanged : 0);
+		(horz ? RowItemHExtentsChanged : 0) |
+		(vert ? RowItemVExtentsChanged : 0);
 	lazy_event_handler_.start();
 }
 
@@ -741,9 +742,9 @@ void View::on_signals_moved()
 
 void View::process_sticky_events()
 {
-	if (sticky_events_ & SelectableItemHExtentsChanged)
+	if (sticky_events_ & RowItemHExtentsChanged)
 		update_layout();
-	if (sticky_events_ & SelectableItemVExtentsChanged)
+	if (sticky_events_ & RowItemVExtentsChanged)
 		restack_all_row_items();
 
 	// Clear the sticky events