Test fix for further osx modifier ambiguity.
authornick_m <mainsbridge@gmail.com>
Mon, 19 Oct 2015 17:08:28 +0000 (04:08 +1100)
committernick_m <mainsbridge@gmail.com>
Mon, 19 Oct 2015 17:08:28 +0000 (04:08 +1100)
gtk2_ardour/rc_option_editor.cc

index eab18ab50372e6d84c336eb45272bdf6a6462eae..e86c3a620ea1851b5c74e01a52bf9e41b4aa6ab6 100644 (file)
@@ -333,13 +333,13 @@ static const struct {
        { "Command", GDK_MOD2_MASK },
        { "Control", GDK_CONTROL_MASK },
        { "Option", GDK_MOD1_MASK },
-       { "Command-Shift", GDK_META_MASK|GDK_SHIFT_MASK },
-       { "Command-Option", GDK_MOD1_MASK|GDK_META_MASK },
-       { "Command-Option-Control", GDK_MOD1_MASK|GDK_META_MASK|GDK_CONTROL_MASK },
+       { "Command-Shift", GDK_MOD2_MASK|GDK_SHIFT_MASK },
+       { "Command-Option", GDK_MOD2_MASK|GDK_MOD1_MASK },
+       { "Command-Option-Control", GDK_MOD2_MASK|GDK_MOD1_MASK|GDK_CONTROL_MASK },
        { "Option-Control", GDK_MOD1_MASK|GDK_CONTROL_MASK },
        { "Option-Shift", GDK_MOD1_MASK|GDK_SHIFT_MASK },
        { "Control-Shift", GDK_CONTROL_MASK|GDK_SHIFT_MASK },
-       { "Shift-Command-Option", GDK_MOD5_MASK|GDK_SHIFT_MASK|GDK_META_MASK },
+       { "Shift-Command-Option", GDK_MOD5_MASK|GDK_SHIFT_MASK|GDK_MOD2_MASK },
 
 #else
        { "Key|Shift", GDK_SHIFT_MASK },