projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ruler: Fix context menu for items on the ruler
[pulseview.git]
/
pv
/
views
/
trace
/
ruler.cpp
diff --git
a/pv/views/trace/ruler.cpp
b/pv/views/trace/ruler.cpp
index 6e74ddd0a29a272b2d1661b64d2054949767f040..acea8a368b457469e44c11e758f95f935a56e68e 100644
(file)
--- a/
pv/views/trace/ruler.cpp
+++ b/
pv/views/trace/ruler.cpp
@@
-121,6
+121,12
@@
pv::util::Timestamp Ruler::get_time_from_x_pos(uint32_t x) const
void Ruler::contextMenuEvent(QContextMenuEvent *event)
{
void Ruler::contextMenuEvent(QContextMenuEvent *event)
{
+ MarginWidget::contextMenuEvent(event);
+
+ // Don't show a context menu if the MarginWidget found a widget that shows one
+ if (event->isAccepted())
+ return;
+
context_menu_x_pos_ = event->pos().x();
QMenu *const menu = new QMenu(this);
context_menu_x_pos_ = event->pos().x();
QMenu *const menu = new QMenu(this);
@@
-143,6
+149,7
@@
void Ruler::contextMenuEvent(QContextMenuEvent *event)
toggle_hover_marker->setText(hover_marker_shown ?
tr("Disable mouse hover marker") : tr("Enable mouse hover marker"));
toggle_hover_marker->setText(hover_marker_shown ?
tr("Disable mouse hover marker") : tr("Enable mouse hover marker"));
+ event->setAccepted(true);
menu->popup(event->globalPos());
}
menu->popup(event->globalPos());
}