X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fviewwidget.cpp;h=46946a5cd5d36b5cff8d09d2f29471a8454867c2;hp=d5b949c0dabcf89e196dadeeb35bf37a230c2cf2;hb=af33d4cbacc745f4473f5c0f4fa1f9ebb8d84d0a;hpb=f4ab4b5c657e5613caba82feaa81a8a400e4f331

diff --git a/pv/views/trace/viewwidget.cpp b/pv/views/trace/viewwidget.cpp
index d5b949c0..46946a5c 100644
--- a/pv/views/trace/viewwidget.cpp
+++ b/pv/views/trace/viewwidget.cpp
@@ -105,9 +105,9 @@ void ViewWidget::drag_items(const QPoint &delta)
 	bool item_dragged = false;
 
 	// Drag the row items
-	const vector< shared_ptr<RowItem> > row_items(
-		view_.list_by_type<RowItem>());
-	for (const shared_ptr<RowItem>& r : row_items)
+	const vector< shared_ptr<ViewItem> > row_items(
+		view_.list_by_type<ViewItem>());
+	for (const shared_ptr<ViewItem>& r : row_items)
 		if (r->dragging()) {
 			r->drag_by(delta);
 
@@ -252,17 +252,21 @@ void ViewWidget::mousePressEvent(QMouseEvent *event)
 {
 	assert(event);
 
-	/* Ignore right click events as they will open context menus when
+	if (event->button() & Qt::LeftButton) {
+		mouse_down_point_ = event->pos();
+		mouse_down_item_ = get_mouse_over_item(event->pos());
+		mouse_left_press_event(event);
+	}
+
+	/* Don't forward right click events as they will open context menus when
 	 * used on trace labels. Those menus prevent ViewWidget::mouseReleaseEvent()
 	 * to be triggered upon button release, making mouse_down_item_
 	 * hold the last reference to a view item that might have been deleted
 	 * from the context menu, preventing it from being freed as intended.
+	 * TODO Remove this once context menus are handled separately
 	 */
-	if (event->button() & Qt::LeftButton) {
+	if (event->button() & Qt::RightButton)
 		mouse_down_point_ = event->pos();
-		mouse_down_item_ = get_mouse_over_item(event->pos());
-		mouse_left_press_event(event);
-	}
 }
 
 void ViewWidget::mouseReleaseEvent(QMouseEvent *event)