diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-10 23:01:45 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-10 23:01:45 +0000 |
| commit | a3bcba2357f4ab724b9c840bacd79f4d6c959415 (patch) | |
| tree | 6cf3ee12e519b3a4f8d6e6c29ee1ccb54e47eecb /libs/gtkmm2ext/pixscroller.cc | |
| parent | 6ab765e8fab08b186aa77e3ac01c33e0dbfc1ba1 (diff) | |
fulfill the promise of an in-library Keyboard object, and use platform specific modifiers throughout libgtkmm2ext. also fix up scrolling of pixfaders by making them grab keyboard magic focus when the mouse pointer is within them
git-svn-id: svn://localhost/ardour2/branches/3.0@6344 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/gtkmm2ext/pixscroller.cc')
| -rw-r--r-- | libs/gtkmm2ext/pixscroller.cc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libs/gtkmm2ext/pixscroller.cc b/libs/gtkmm2ext/pixscroller.cc index f459726f27..f20e11c9ca 100644 --- a/libs/gtkmm2ext/pixscroller.cc +++ b/libs/gtkmm2ext/pixscroller.cc @@ -23,7 +23,8 @@ #include <gtkmm.h> -#include <gtkmm2ext/pixscroller.h> +#include "gtkmm2ext/pixscroller.h" +#include "gtkmm2ext/keyboard.h" using namespace std; using namespace Gtk; @@ -116,7 +117,7 @@ PixScroller::on_button_press_event (GdkEventButton* ev) { switch (ev->button) { case 1: - if (!(ev->state & Gdk::SHIFT_MASK)) { + if (!(ev->state & Keyboard::TertiaryModifier)) { add_modal_grab(); grab_y = ev->y; grab_start = ev->y; @@ -137,8 +138,8 @@ PixScroller::on_button_release_event (GdkEventButton* ev) { double scale; - if (ev->state & GDK_CONTROL_MASK) { - if (ev->state & GDK_MOD1_MASK) { + if (ev->state & Keyboard::PrimaryModifier) { + if (ev->state & Keyboard::SecondaryModifier) { scale = 0.05; } else { scale = 0.1; @@ -170,7 +171,7 @@ PixScroller::on_button_release_event (GdkEventButton* ev) adj.set_value (scale * fract * (adj.get_upper() - adj.get_lower())); } } else { - if (ev->state & Gdk::SHIFT_MASK) { + if (ev->state & Keyboard::TertiaryModifier) { adj.set_value (default_value); cerr << "default value = " << default_value << endl; } @@ -187,8 +188,8 @@ PixScroller::on_scroll_event (GdkEventScroll* ev) { double scale; - if (ev->state & GDK_CONTROL_MASK) { - if (ev->state & GDK_MOD1_MASK) { + if (ev->state & Keyboard::PrimaryModifier) { + if (ev->state & Keyboard::SecondaryModifier) { scale = 0.05; } else { scale = 0.1; @@ -227,8 +228,8 @@ PixScroller::on_motion_notify_event (GdkEventMotion* ev) return true; } - if (ev->state & GDK_CONTROL_MASK) { - if (ev->state & GDK_MOD1_MASK) { + if (ev->state & Keyboard::PrimaryModifier) { + if (ev->state & Keyboard::SecondaryModifier) { scale = 0.05; } else { scale = 0.1; |