X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fcursorheader.cpp;h=c324410a75cb873aaed571cea402f23981ad36ec;hb=d4e39570ee6021766c375654801dddba45b9198a;hp=22c1259f99622fb94d53d74ab41098f0ff265ac7;hpb=e95fb8e943bd24e18ba5d237f259a76e705f3914;p=pulseview.git

diff --git a/pv/view/cursorheader.cpp b/pv/view/cursorheader.cpp
index 22c1259f..c324410a 100644
--- a/pv/view/cursorheader.cpp
+++ b/pv/view/cursorheader.cpp
@@ -47,7 +47,6 @@ int CursorHeader::calculateTextHeight()
 
 CursorHeader::CursorHeader(View &parent) :
 	MarginWidget(parent),
-	dragging_(false),
 	textHeight_(calculateTextHeight())
 {
 	setMouseTracking(true);
@@ -76,13 +75,16 @@ void CursorHeader::paintEvent(QPaintEvent*)
 	// would be clipped away.
 	const QRect r = rect().adjusted(0, 0, 0, -BaselineOffset);
 
-	// Draw the cursors
-	if (view_.cursors_shown())
-		view_.cursors()->draw_markers(p, r);
+	// Draw the items
+	const vector< shared_ptr<TimeItem> > items(view_.time_items());
+	for (auto &m : items)
+		m->paint_label(p, r);
 }
 
 void CursorHeader::mouseMoveEvent(QMouseEvent *e)
 {
+	mouse_point_ = e->pos();
+
 	if (!(e->buttons() & Qt::LeftButton))
 		return;
 
@@ -98,7 +100,8 @@ void CursorHeader::mouseMoveEvent(QMouseEvent *e)
 	for (auto &i : items)
 		if (i->dragging())
 			i->set_time(view_.offset() +
-				(i->drag_point().x() + delta) * view_.scale());
+				(i->drag_point().x() + delta - 0.5) *
+				view_.scale());
 }
 
 void CursorHeader::mousePressEvent(QMouseEvent *e)
@@ -132,10 +135,12 @@ void CursorHeader::mouseReleaseEvent(QMouseEvent *)
 
 	if (!dragging_ && mouse_down_item_) {
 		Popup *const p = mouse_down_item_->create_popup(&view_);
-		const QPoint arrpos(mouse_down_item_->get_x(),
-			height() - BaselineOffset);
-		p->set_position(mapToGlobal(arrpos), Popup::Bottom);
-		p->show();
+		if (p) {
+			const QPoint arrpos(mouse_down_item_->get_x(),
+				height() - BaselineOffset);
+			p->set_position(mapToGlobal(arrpos), Popup::Bottom);
+			p->show();
+		}
 	}
 
 	dragging_ = false;
@@ -146,5 +151,11 @@ void CursorHeader::mouseReleaseEvent(QMouseEvent *)
 		i->drag_release();
 }
 
+void CursorHeader::leaveEvent(QEvent*)
+{
+	mouse_point_ = QPoint(-1, -1);
+	update();
+}
+
 } // namespace view
 } // namespace pv