diff options
| author | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2013-06-21 20:13:44 +0100 |
|---|---|---|
| committer | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2013-06-21 20:13:44 +0100 |
| commit | 21914c884eebbddbb38804a8d51a38323e6de726 (patch) | |
| tree | a11417b8e7c2c5932b7fe969a58199d757209125 /libs | |
| parent | e6e5aab81285400b3268bb3931f981b709860f26 (diff) | |
Make scroll-wheel modifier keys consistent in main editor window.
Add constants for the keyboard modifiers that should be used for vertical
zoom, horizontal zoom, and horizontal scrolling in the main editor window,
and use these where appropriate rather than using Keyboard::PrimaryModifier
and friends directly.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/keyboard.h | 5 | ||||
| -rw-r--r-- | libs/gtkmm2ext/keyboard.cc | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/libs/gtkmm2ext/gtkmm2ext/keyboard.h b/libs/gtkmm2ext/gtkmm2ext/keyboard.h index 909f791403..84988e1525 100644 --- a/libs/gtkmm2ext/gtkmm2ext/keyboard.h +++ b/libs/gtkmm2ext/gtkmm2ext/keyboard.h @@ -59,6 +59,11 @@ class Keyboard : public sigc::trackable, PBD::Stateful static uint32_t GainFineScaleModifier; static uint32_t GainExtraFineScaleModifier; + // Modifiers for scroll wheel + static uint32_t ScrollZoomVerticalModifier; + static uint32_t ScrollZoomHorizontalModifier; + static uint32_t ScrollHorizontalModifier; + static const char* primary_modifier_name (); static const char* secondary_modifier_name (); static const char* tertiary_modifier_name (); diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc index 9966972edb..f694471d9a 100644 --- a/libs/gtkmm2ext/keyboard.cc +++ b/libs/gtkmm2ext/keyboard.cc @@ -94,6 +94,11 @@ const char* Keyboard::rangeselect_modifier_name() { return S_("Key|Shift"); } guint Keyboard::GainFineScaleModifier = Keyboard::PrimaryModifier; guint Keyboard::GainExtraFineScaleModifier = Keyboard::SecondaryModifier; +guint Keyboard::ScrollZoomVerticalModifier = Keyboard::SecondaryModifier; +guint Keyboard::ScrollZoomHorizontalModifier = Keyboard::PrimaryModifier; +guint Keyboard::ScrollHorizontalModifier = Keyboard::TertiaryModifier; + + Keyboard* Keyboard::_the_keyboard = 0; Gtk::Window* Keyboard::current_window = 0; bool Keyboard::_some_magic_widget_has_focus = false; |