X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursorheader.cpp;h=981a958b8d0d94ec3d515fcfba3dce82844c8d76;hp=1a656eb19f5edac14b7595c7db6569fa45de0822;hb=2fae5107535c39adde322393d2f6d18098c0154e;hpb=2496bf451ebd50b9ab67a1af9b979761c0fbad49

diff --git a/pv/view/cursorheader.cpp b/pv/view/cursorheader.cpp
index 1a656eb1..981a958b 100644
--- a/pv/view/cursorheader.cpp
+++ b/pv/view/cursorheader.cpp
@@ -71,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()->paint_label(p, r);
 }
 
 void CursorHeader::mouseMoveEvent(QMouseEvent *e)
@@ -90,11 +90,15 @@ void CursorHeader::mouseMoveEvent(QMouseEvent *e)
 		QApplication::startDragDistance())
 		return;
 
+	// Do the drag
 	dragging_ = true;
 
-	if (shared_ptr<TimeMarker> m = grabbed_marker_.lock())
-		m->set_time(view_.offset() +
-			((double)e->x() + 0.5) * view_.scale());
+	const int delta = e->pos().x() - mouse_down_point_.x();
+	const vector< shared_ptr<TimeItem> > items(view_.time_items());
+	for (auto &i : items)
+		if (i->dragging())
+			i->set_time(view_.offset() +
+				(i->drag_point().x() + delta) * view_.scale());
 }
 
 void CursorHeader::mousePressEvent(QMouseEvent *e)
@@ -102,22 +106,21 @@ void CursorHeader::mousePressEvent(QMouseEvent *e)
 	if (e->buttons() & Qt::LeftButton) {
 		mouse_down_point_ = e->pos();
 
-		grabbed_marker_.reset();
+		mouse_down_item_.reset();
 
 		clear_selection();
 
-		if (view_.cursors_shown()) {
-			CursorPair &cursors = view_.cursors();
-			if (cursors.first()->get_label_rect(
-				rect()).contains(e->pos()))
-				grabbed_marker_ = cursors.first();
-			else if (cursors.second()->get_label_rect(
-				rect()).contains(e->pos()))
-				grabbed_marker_ = cursors.second();
-		}
+		const vector< shared_ptr<TimeItem> > items(view_.time_items());
+		for (auto &i : items)
+			if (i && i->label_rect(rect()).contains(e->pos())) {
+				mouse_down_item_ = i;
+				break;
+			}
 
-		if (shared_ptr<TimeMarker> m = grabbed_marker_.lock())
-			m->select();
+		if (mouse_down_item_) {
+			mouse_down_item_->select();
+			mouse_down_item_->drag();
+		}
 
 		selection_changed();
 	}
@@ -127,16 +130,22 @@ void CursorHeader::mouseReleaseEvent(QMouseEvent *)
 {
 	using pv::widgets::Popup;
 
-	if (!dragging_)
-		if (shared_ptr<TimeMarker> m = grabbed_marker_.lock()) {
-			Popup *const p = m->create_popup(&view_);
-			const QPoint arrpos(m->get_x(), height() - BaselineOffset);
+	if (!dragging_ && mouse_down_item_) {
+		Popup *const p = mouse_down_item_->create_popup(&view_);
+		if (p) {
+			const QPoint arrpos(mouse_down_item_->get_x(),
+				height() - BaselineOffset);
 			p->set_position(mapToGlobal(arrpos), Popup::Bottom);
 			p->show();
 		}
+	}
 
 	dragging_ = false;
-	grabbed_marker_.reset();
+	mouse_down_item_.reset();
+
+	const vector< shared_ptr<TimeItem> > items(view_.time_items());
+	for (auto &i : items)
+		i->drag_release();
 }
 
 } // namespace view