From 46619570911e4ef7dd4bddcd843d0fa36102bbc2 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 21 Jun 2022 20:17:01 +0200 Subject: [PATCH] Re-establish 47932fb7bfc7b (which was lost in e557245bf782) --- libs/gtkmm2ext/keyboard.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc index 87f37a2b9b..7c074bff62 100644 --- a/libs/gtkmm2ext/keyboard.cc +++ b/libs/gtkmm2ext/keyboard.cc @@ -71,6 +71,7 @@ guint Keyboard::Level4Modifier = GDK_MOD1_MASK; // Alt/Option guint Keyboard::CopyModifier = GDK_CONTROL_MASK; // Control guint Keyboard::RangeSelectModifier = GDK_SHIFT_MASK; guint Keyboard::button2_modifiers = Keyboard::SecondaryModifier|Keyboard::Level4Modifier; +guint Keyboard::momentary_push_modifiers = Keyboard::PrimaryModifier; const char* Keyboard::primary_modifier_name() { return _("Command"); } const char* Keyboard::secondary_modifier_name() { return _("Control"); } @@ -97,6 +98,7 @@ guint Keyboard::Level4Modifier = GDK_MOD4_MASK|GDK_SUPER_MASK; // Mod4/Windows guint Keyboard::CopyModifier = GDK_CONTROL_MASK; guint Keyboard::RangeSelectModifier = GDK_SHIFT_MASK; guint Keyboard::button2_modifiers = 0; /* not used */ +guint Keyboard::momentary_push_modifiers = 0; /* not used */ const char* Keyboard::primary_modifier_name() { return _("Control"); } const char* Keyboard::secondary_modifier_name() { return _("Alt"); } @@ -104,7 +106,7 @@ const char* Keyboard::tertiary_modifier_name() { return S_("Key|Shift"); } const char* Keyboard::level4_modifier_name() { return _("Windows"); } const char* Keyboard::button2_name() { return _("Middle-Click"); } -const char* Keyboard::momentary_push_name() { return _("Cmd+Click or Middle-Click"); } +const char* Keyboard::momentary_push_name() { return _("Middle-Click"); } const char* Keyboard::primary_modifier_short_name() { return _("Ctrl"); } const char* Keyboard::secondary_modifier_short_name() { return _("Alt"); } @@ -116,8 +118,6 @@ guint Keyboard::snap_delta_mod = Keyboard::SecondaryModifier|Keyboard::Level4Mod #endif -guint Keyboard::momentary_push_modifiers = Keyboard::PrimaryModifier; - guint Keyboard::group_override_modifiers = Keyboard::TertiaryModifier; const char* Keyboard::group_override_event_name() { return tertiary_modifier_name(); }