diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2008-11-03 17:05:17 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-11-03 17:05:17 +0000 |
commit | bb520383a374789783321d4c19d71c97541c4315 (patch) | |
tree | b3770a9d8edc291164038deafb6299658e83dfa8 /gtk2_ardour/route_ui.cc | |
parent | 1ae268ad2a817a7d6843ce09efb32f3dc0fa6281 (diff) |
meta-fy handling of button2, to deal with apple's messed up design decisions; on gtk/osx, button2 is (currently) Ctrl-Option-Button1
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4087 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/route_ui.cc')
-rw-r--r-- | gtk2_ardour/route_ui.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index a46a61314c..de6b6cfad9 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -218,7 +218,7 @@ RouteUI::mute_press(GdkEventButton* ev) } else { - if (ev->button == 2) { + if (Keyboard::is_button2_event (ev)) { // Primary-button2 click is the midi binding click // button2-click is "momentary" @@ -229,7 +229,7 @@ RouteUI::mute_press(GdkEventButton* ev) } } - if (ev->button == 1 || ev->button == 2) { + if (ev->button == 1 || Keyboard::is_button2_event (ev)) { if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) { @@ -301,7 +301,7 @@ RouteUI::solo_press(GdkEventButton* ev) } else { - if (ev->button == 2) { + if (Keyboard::is_button2_event (ev)) { // Primary-button2 click is the midi binding click // button2-click is "momentary" @@ -313,7 +313,7 @@ RouteUI::solo_press(GdkEventButton* ev) } } - if (ev->button == 1 || ev->button == 2) { + if (ev->button == 1 || Keyboard::is_button2_event (ev)) { if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) { @@ -398,7 +398,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev) if (!ignore_toggle && is_track() && rec_enable_button) { - if (ev->button == 2 && Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { + if (Keyboard::is_button2_event (ev) && Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { // do nothing on midi bind event return false; |