X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fmarginwidget.cpp;h=c2d443651f2c740369ff0d3678d096b049ee5eaf;hb=945238ca07e313568f1df5be1857f5f7db33d700;hp=fa12c2b5b8d9257e8d5e24b885c4a711ee34055d;hpb=1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff;p=pulseview.git

diff --git a/pv/views/trace/marginwidget.cpp b/pv/views/trace/marginwidget.cpp
index fa12c2b5..c2d44365 100644
--- a/pv/views/trace/marginwidget.cpp
+++ b/pv/views/trace/marginwidget.cpp
@@ -53,13 +53,17 @@ void MarginWidget::show_popup(const shared_ptr<ViewItem> &item)
 
 void MarginWidget::contextMenuEvent(QContextMenuEvent *event)
 {
+	event->setAccepted(false);
+
 	const shared_ptr<ViewItem> r = get_mouse_over_item(mouse_point_);
 	if (!r)
 		return;
 
-	QMenu *menu = r->create_context_menu(this);
-	if (menu)
-		menu->exec(event->globalPos());
+	QMenu *menu = r->create_header_context_menu(this);
+	if (menu) {
+		event->setAccepted(true);
+		menu->popup(event->globalPos());
+	}
 }
 
 void MarginWidget::keyPressEvent(QKeyEvent *event)
@@ -72,6 +76,8 @@ void MarginWidget::keyPressEvent(QKeyEvent *event)
 			if (i->selected())
 				i->delete_pressed();
 	}
+
+    ViewWidget::keyPressEvent(event);
 }
 
 } // namespace trace