diff options
| author | Robin Gareus <robin@gareus.org> | 2017-03-24 14:36:17 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-03-24 14:48:46 +0100 |
| commit | 962e7a214aa8841f88e5fbf6bb12499dfddeb269 (patch) | |
| tree | e6bd8a77440a43d4669ddcbfe761873a0e6c7f60 /gtk2_ardour/editor_markers.cc | |
| parent | 55b8b44889d1d08fc6b64283670fd0953642ba64 (diff) | |
Revert "consistent use of context-menu popups"
This reverts commit b3722f7063699fafd0421d504e05a7300c70e0ec.
In some cases ardour shows context-menu on right-mouse-button
release. In this case selecting a menu-entry should happen
with the left-mouse button (or any button?!)
Using ev->button is only correct if the menu is temporary and only
visible while the button is held, button release then activates the
menu-item.
This needs further work, in some cases allowing any button (0) to work
makes sense and overall consistency needs to be improved.
Different places use different strategies for context-menus which
don't always match the button used in the event-handler.
This is a hotfix (to make TAV context menus work again with left-click)
Diffstat (limited to 'gtk2_ardour/editor_markers.cc')
| -rw-r--r-- | gtk2_ardour/editor_markers.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 86318b5254..40942e1569 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -810,7 +810,7 @@ Editor::tempo_or_meter_marker_context_menu (GdkEventButton* ev, ArdourCanvas::It can_remove = !mm->meter().initial (); delete meter_marker_menu; build_meter_marker_menu (mm, can_remove); - meter_marker_menu->popup (ev->button, ev->time); + meter_marker_menu->popup (1, ev->time); } else if (tm) { if (!tm->tempo().active()) { return; @@ -818,7 +818,7 @@ Editor::tempo_or_meter_marker_context_menu (GdkEventButton* ev, ArdourCanvas::It can_remove = !tm->tempo().initial() && !tm->tempo().locked_to_meter(); delete tempo_marker_menu; build_tempo_marker_menu (tm, can_remove); - tempo_marker_menu->popup (ev->button, ev->time); + tempo_marker_menu->popup (1, ev->time); } else { return; } @@ -842,7 +842,7 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item) build_range_marker_menu (loc, loc == transport_loop_location() || loc == transport_punch_location(), loc->is_session_range()); marker_menu_item = item; - transport_marker_menu->popup (ev->button, ev->time); + transport_marker_menu->popup (1, ev->time); } else if (loc->is_mark()) { @@ -864,14 +864,14 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item) } #endif marker_menu_item = item; - marker_menu->popup (ev->button, ev->time); + marker_menu->popup (1, ev->time); } else if (loc->is_range_marker()) { delete range_marker_menu; build_range_marker_menu (loc, false, false); marker_menu_item = item; - range_marker_menu->popup (ev->button, ev->time); + range_marker_menu->popup (1, ev->time); } } @@ -882,7 +882,7 @@ Editor::new_transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Ite build_new_transport_marker_menu (); } - new_transport_marker_menu->popup (ev->button, ev->time); + new_transport_marker_menu->popup (1, ev->time); } |