smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

consistent use of context-menu popups

Browse source
This commit is contained in:
Robin Gareus 2017-03-16 02:24:57 +01:00
parent e5d48a8544
commit b3722f7063
13 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ardour_ui_ed.cc
View file

@ -901,7 +901,7 @@ ARDOUR_UI::tabbable_visibility_button_press (GdkEventButton* ev, string const& t
string menu_name = string ("/ui/") + tabbable_name + X_("TabbableButtonMenu"); string menu_name = string ("/ui/") + tabbable_name + X_("TabbableButtonMenu");
Gtk::Menu* menu = dynamic_cast<Gtk::Menu*> (ActionManager::get_widget (menu_name.c_str())); Gtk::Menu* menu = dynamic_cast<Gtk::Menu*> (ActionManager::get_widget (menu_name.c_str()));
if (menu) { if (menu) {
menu->popup (3, ev->time); menu->popup (ev->button, ev->time);
} }
return true; return true;
} }

2
gtk2_ardour/audio_clock.cc
View file

@ -1568,7 +1568,7 @@ AudioClock::on_button_release_event (GdkEventButton *ev)
if (ops_menu == 0) { if (ops_menu == 0) {
build_ops_menu (); build_ops_menu ();
} }
ops_menu->popup (1, ev->time); ops_menu->popup (ev->button, ev->time);
return true; return true;
} }

4
gtk2_ardour/automation_controller.cc
View file

@ -296,7 +296,7 @@ AutomationController::on_button_release(GdkEventButton* ev)
MenuList& items = menu->items(); MenuList& items = menu->items();
items.push_back(MenuElem(_("Select Note..."), items.push_back(MenuElem(_("Select Note..."),
sigc::mem_fun(*this, &AutomationController::run_note_select_dialog))); sigc::mem_fun(*this, &AutomationController::run_note_select_dialog)));
menu->popup(1, ev->time); menu->popup(ev->button, ev->time);
return true; return true;
} else if (desc.unit == ARDOUR::ParameterDescriptor::HZ) { } else if (desc.unit == ARDOUR::ParameterDescriptor::HZ) {
Gtk::Menu* menu = manage(new Menu()); Gtk::Menu* menu = manage(new Menu());
@ -320,7 +320,7 @@ AutomationController::on_button_release(GdkEventButton* ev)
(double)beats))); (double)beats)));
} }
} }
menu->popup(1, ev->time); menu->popup(ev->button, ev->time);
return true; return true;
} }

2
gtk2_ardour/control_slave_ui.cc
View file

@ -219,7 +219,7 @@ ControlSlaveUI::vca_button_release (GdkEventButton* ev, uint32_t n)
} }
if (!items.empty()) { if (!items.empty()) {
context_menu->popup (1, ev->time); context_menu->popup (ev->button, ev->time);
} }
return true; return true;

12
gtk2_ardour/editor_markers.cc
View file

@ -810,7 +810,7 @@ Editor::tempo_or_meter_marker_context_menu (GdkEventButton* ev, ArdourCanvas::It
can_remove = !mm->meter().initial (); can_remove = !mm->meter().initial ();
delete meter_marker_menu; delete meter_marker_menu;
build_meter_marker_menu (mm, can_remove); build_meter_marker_menu (mm, can_remove);
meter_marker_menu->popup (1, ev->time); meter_marker_menu->popup (ev->button, ev->time);
} else if (tm) { } else if (tm) {
if (!tm->tempo().active()) { if (!tm->tempo().active()) {
return; 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(); can_remove = !tm->tempo().initial() && !tm->tempo().locked_to_meter();
delete tempo_marker_menu; delete tempo_marker_menu;
build_tempo_marker_menu (tm, can_remove); build_tempo_marker_menu (tm, can_remove);
tempo_marker_menu->popup (1, ev->time); tempo_marker_menu->popup (ev->button, ev->time);
} else { } else {
return; 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()); build_range_marker_menu (loc, loc == transport_loop_location() || loc == transport_punch_location(), loc->is_session_range());
marker_menu_item = item; marker_menu_item = item;
transport_marker_menu->popup (1, ev->time); transport_marker_menu->popup (ev->button, ev->time);
} else if (loc->is_mark()) { } else if (loc->is_mark()) {
@ -864,14 +864,14 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
} }
#endif #endif
marker_menu_item = item; marker_menu_item = item;
marker_menu->popup (1, ev->time); marker_menu->popup (ev->button, ev->time);
} else if (loc->is_range_marker()) { } else if (loc->is_range_marker()) {
delete range_marker_menu; delete range_marker_menu;
build_range_marker_menu (loc, false, false); build_range_marker_menu (loc, false, false);
marker_menu_item = item; marker_menu_item = item;
range_marker_menu->popup (1, ev->time); range_marker_menu->popup (ev->button, ev->time);
} }
} }
@ -882,7 +882,7 @@ Editor::new_transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Ite
build_new_transport_marker_menu (); build_new_transport_marker_menu ();
} }
new_transport_marker_menu->popup (1, ev->time); new_transport_marker_menu->popup (ev->button, ev->time);
} }

2
gtk2_ardour/gain_meter.cc
View file

@ -492,7 +492,7 @@ GainMeterBase::popup_meter_menu (GdkEventButton *ev)
items.push_back (MenuElem ("-4 .. -2dBFS")); items.push_back (MenuElem ("-4 .. -2dBFS"));
} }
meter_menu->popup (1, ev->time); meter_menu->popup (ev->button, ev->time);
} }
bool bool

6
gtk2_ardour/mixer_strip.cc
View file

@ -1778,7 +1778,7 @@ MixerStrip::name_button_button_press (GdkEventButton* ev)
Gtkmm2ext::anchored_menu_popup(route_ops_menu, &name_button, "", Gtkmm2ext::anchored_menu_popup(route_ops_menu, &name_button, "",
1, ev->time); 1, ev->time);
} else { } else {
route_ops_menu->popup (3, ev->time); route_ops_menu->popup (ev->button, ev->time);
} }
return true; return true;
@ -1790,10 +1790,10 @@ MixerStrip::name_button_button_press (GdkEventButton* ev)
gboolean gboolean
MixerStrip::number_button_button_press (GdkEventButton* ev) MixerStrip::number_button_button_press (GdkEventButton* ev)
{ {
if ( ev->button == 3 ) { if (ev->button == 3) {
list_route_operations (); list_route_operations ();
route_ops_menu->popup (1, ev->time); route_ops_menu->popup (ev->button, ev->time);
return true; return true;
} }

6
gtk2_ardour/panner_ui.cc
View file

@ -381,7 +381,7 @@ PannerUI::pan_button_event (GdkEventButton* ev)
pan_menu->set_name ("ArdourContextMenu"); pan_menu->set_name ("ArdourContextMenu");
} }
build_pan_menu (); build_pan_menu ();
pan_menu->popup (1, ev->time); pan_menu->popup (ev->button, ev->time);
return true; return true;
break; break;
default: default:
@ -506,7 +506,7 @@ PannerUI::pan_automation_state_button_event (GdkEventButton *ev)
if (pan_astate_menu == 0) { if (pan_astate_menu == 0) {
build_astate_menu (); build_astate_menu ();
} }
pan_astate_menu->popup (1, ev->time); pan_astate_menu->popup (ev->button, ev->time);
break; break;
default: default:
break; break;
@ -527,7 +527,7 @@ PannerUI::pan_automation_style_button_event (GdkEventButton *ev)
if (pan_astyle_menu == 0) { if (pan_astyle_menu == 0) {
build_astyle_menu (); build_astyle_menu ();
} }
pan_astyle_menu->popup (1, ev->time); pan_astyle_menu->popup (ev->button, ev->time);
break; break;
default: default:
break; break;

2
gtk2_ardour/processor_box.cc
View file

@ -2222,7 +2222,7 @@ ProcessorBox::show_processor_menu (int arg)
&& !boost::dynamic_pointer_cast<Amp> (single_selection->processor ()) && !boost::dynamic_pointer_cast<Amp> (single_selection->processor ())
&& !boost::dynamic_pointer_cast<UnknownProcessor> (single_selection->processor ())); && !boost::dynamic_pointer_cast<UnknownProcessor> (single_selection->processor ()));
processor_menu->popup (1, arg); processor_menu->popup (3, arg);
/* Add a placeholder gap to the processor list to indicate where a processor would be /* Add a placeholder gap to the processor list to indicate where a processor would be
inserted were one chosen from the menu. inserted were one chosen from the menu.

10
gtk2_ardour/route_ui.cc
View file

@ -426,7 +426,7 @@ RouteUI::mute_press (GdkEventButton* ev)
build_mute_menu(); build_mute_menu();
} }
mute_menu->popup(0,ev->time); mute_menu->popup(ev->button, ev->time);
return true; return true;
@ -604,7 +604,7 @@ RouteUI::solo_press(GdkEventButton* ev)
build_solo_menu (); build_solo_menu ();
} }
solo_menu->popup (1, ev->time); solo_menu->popup (ev->button, ev->time);
} }
} else { } else {
@ -1009,7 +1009,7 @@ RouteUI::rec_enable_release (GdkEventButton* ev)
if (Keyboard::is_context_menu_event (ev)) { if (Keyboard::is_context_menu_event (ev)) {
build_record_menu (); build_record_menu ();
if (record_menu) { if (record_menu) {
record_menu->popup (1, ev->time); record_menu->popup (ev->button, ev->time);
} }
return false; return false;
} }
@ -1128,7 +1128,7 @@ RouteUI::show_sends_press(GdkEventButton* ev)
build_sends_menu (); build_sends_menu ();
} }
sends_menu->popup (0, ev->time); sends_menu->popup (ev->button, ev->time);
} else { } else {
@ -2139,7 +2139,7 @@ RouteUI::invert_press (GdkEventButton* ev)
--_i_am_the_modifier; --_i_am_the_modifier;
} }
_invert_menu->popup (0, ev->time); _invert_menu->popup (ev->button, ev->time);
return true; return true;
} }

2
gtk2_ardour/time_axis_view.cc
View file

@ -744,7 +744,7 @@ TimeAxisView::popup_display_menu (guint32 when)
build_display_menu (); build_display_menu ();
if (!display_menu->items().empty()) { if (!display_menu->items().empty()) {
display_menu->popup (1, when); display_menu->popup (3, when);
} }
} }

4
gtk2_ardour/vca_master_strip.cc
View file

@ -377,7 +377,7 @@ VCAMasterStrip::vertical_button_press (GdkEventButton* ev)
if (!context_menu) { if (!context_menu) {
build_context_menu (); build_context_menu ();
} }
context_menu->popup (1, ev->time); context_menu->popup (ev->button, ev->time);
return true; return true;
} }
@ -395,7 +395,7 @@ VCAMasterStrip::number_button_press (GdkEventButton* ev)
if (!context_menu) { if (!context_menu) {
build_context_menu (); build_context_menu ();
} }
context_menu->popup (1, ev->time); context_menu->popup (ev->button, ev->time);
} }
return true; return true;
} }

2
gtk2_ardour/visibility_group.cc
View file

@ -69,7 +69,7 @@ VisibilityGroup::button_press_event (GdkEventButton* ev)
return false; return false;
} }
menu()->popup (1, ev->time); menu()->popup (ev->button, ev->time);
return true; return true;
} }