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

diff --git a/pv/view/cursorheader.cpp b/pv/view/cursorheader.cpp
index 981a958b..efc9205e 100644
--- a/pv/view/cursorheader.cpp
+++ b/pv/view/cursorheader.cpp
@@ -47,10 +47,8 @@ int CursorHeader::calculateTextHeight()
 
 CursorHeader::CursorHeader(View &parent) :
 	MarginWidget(parent),
-	dragging_(false),
 	textHeight_(calculateTextHeight())
 {
-	setMouseTracking(true);
 }
 
 QSize CursorHeader::sizeHint() const
@@ -76,13 +74,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()->paint_label(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 +99,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)
@@ -111,9 +113,9 @@ void CursorHeader::mousePressEvent(QMouseEvent *e)
 		clear_selection();
 
 		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;
+		for (auto i = items.rbegin(); i != items.rend(); i++)
+			if ((*i)->label_rect(rect()).contains(e->pos())) {
+				mouse_down_item_ = (*i);
 				break;
 			}
 
@@ -148,5 +150,29 @@ void CursorHeader::mouseReleaseEvent(QMouseEvent *)
 		i->drag_release();
 }
 
+void CursorHeader::leaveEvent(QEvent*)
+{
+	mouse_point_ = QPoint(-1, -1);
+	update();
+}
+
+void CursorHeader::mouseDoubleClickEvent(QMouseEvent *e)
+{
+	view_.add_flag(view_.offset() + ((double)e->x() + 0.5) * view_.scale());
+}
+
+void CursorHeader::keyPressEvent(QKeyEvent *e)
+{
+	assert(e);
+
+	if (e->key() == Qt::Key_Delete)
+	{
+		const vector< shared_ptr<TimeItem> > items(view_.time_items());
+		for (auto &i : items)
+			if (i->selected())
+				i->delete_pressed();
+	}
+}
+
 } // namespace view
 } // namespace pv