DecodeTrace: Fix on_setting_changed() handling

[pulseview.git] / pv / views / trace / marginwidget.cpp

diff --git a/pv/views/trace/marginwidget.cpp b/pv/views/trace/marginwidget.cpp
index fa12c2b5b8d9257e8d5e24b885c4a711ee34055d..c2d443651f2c740369ff0d3678d096b049ee5eaf 100644 (file)
--- 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