X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursorheader.cpp;h=2835750b9647bcd2a5fd41a490cb13dadbafb7db;hp=3e2944e09269304a823db91b49fe6ecaef06f2da;hb=689dea92f288564260ef521f6f499e03e3cdbbd2;hpb=361c560ed9ef67278916e086ed0b0649ae01b583

diff --git a/pv/view/cursorheader.cpp b/pv/view/cursorheader.cpp
index 3e2944e0..2835750b 100644
--- a/pv/view/cursorheader.cpp
+++ b/pv/view/cursorheader.cpp
@@ -30,6 +30,7 @@
 #include <pv/widgets/popup.hpp>
 
 using std::shared_ptr;
+using std::vector;
 
 namespace pv {
 namespace view {
@@ -59,9 +60,9 @@ QSize CursorHeader::sizeHint() const
 
 void CursorHeader::clear_selection()
 {
-	CursorPair &cursors = view_.cursors();
-	cursors.first()->select(false);
-	cursors.second()->select(false);
+	const vector< shared_ptr<TimeItem> > items(view_.time_items());
+	for (auto &i : items)
+		i->select(false);
 	update();
 }
 
@@ -70,14 +71,14 @@ void CursorHeader::paintEvent(QPaintEvent*)
 	QPainter p(this);
 	p.setRenderHint(QPainter::Antialiasing);
 
+	// The cursor labels are not drawn with the arrows exactly on the
+	// bottom line of the widget, because then the selection shadow
+	// would be clipped away.
+	const QRect r = rect().adjusted(0, 0, 0, -BaselineOffset);
+
 	// Draw the cursors
-	if (view_.cursors_shown()) {
-		// The cursor labels are not drawn with the arrows exactly on the
-		// bottom line of the widget, because then the selection shadow
-		// would be clipped away.
-		const QRect r = rect().adjusted(0, 0, 0, -BaselineOffset);
-		view_.cursors().draw_markers(p, r);
-	}
+	if (view_.cursors_shown())
+		view_.cursors()->draw_markers(p, r);
 }
 
 void CursorHeader::mouseMoveEvent(QMouseEvent *e)
@@ -106,13 +107,13 @@ void CursorHeader::mousePressEvent(QMouseEvent *e)
 		clear_selection();
 
 		if (view_.cursors_shown()) {
-			CursorPair &cursors = view_.cursors();
-			if (cursors.first()->get_label_rect(
+			shared_ptr<CursorPair> cursors(view_.cursors());
+			if (cursors->first()->label_rect(
 				rect()).contains(e->pos()))
-				grabbed_marker_ = cursors.first();
-			else if (cursors.second()->get_label_rect(
+				grabbed_marker_ = cursors->first();
+			else if (cursors->second()->label_rect(
 				rect()).contains(e->pos()))
-				grabbed_marker_ = cursors.second();
+				grabbed_marker_ = cursors->second();
 		}
 
 		if (shared_ptr<TimeMarker> m = grabbed_marker_.lock())