diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-02-15 21:56:25 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-02-15 21:56:25 +0000 |
| commit | cdd8ef7fc864e1eddc5272bfc938e9043f8be7fb (patch) | |
| tree | b5875f6c3272ecd039e45cb96933020930355bca | |
| parent | c15da55cb85ec1152ebc33f0aeac32c0170b1ae9 (diff) | |
now that GDK adds state to scroll events, use it with pixfader; fix up pixfader decls; fix osx_build mistake with SAE binding file name
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3067 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/pixfader.h | 4 | ||||
| -rw-r--r-- | libs/gtkmm2ext/pixfader.cc | 20 | ||||
| -rwxr-xr-x | tools/osx_packaging/osx_build | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/libs/gtkmm2ext/gtkmm2ext/pixfader.h b/libs/gtkmm2ext/gtkmm2ext/pixfader.h index e610d40f22..5d0476681b 100644 --- a/libs/gtkmm2ext/gtkmm2ext/pixfader.h +++ b/libs/gtkmm2ext/gtkmm2ext/pixfader.h @@ -62,8 +62,8 @@ class PixFader : public Gtk::DrawingArea { int display_height (); - static uint fine_scale_modifier; - static uint extra_fine_scale_modifier; + static int fine_scale_modifier; + static int extra_fine_scale_modifier; }; diff --git a/libs/gtkmm2ext/pixfader.cc b/libs/gtkmm2ext/pixfader.cc index b48916ed01..81560cd06a 100644 --- a/libs/gtkmm2ext/pixfader.cc +++ b/libs/gtkmm2ext/pixfader.cc @@ -28,12 +28,12 @@ using namespace Gdk; using namespace std; #ifdef GTKOSX -uint PixFader::fine_scale_modifier = GDK_META_MASK; +int PixFader::fine_scale_modifier = GDK_META_MASK; #else -uint PixFader::fine_scale_modifier = GDK_CONTROL_MASK; +int PixFader::fine_scale_modifier = GDK_CONTROL_MASK; #endif -uint PixFader::extra_fine_scale_modifier = GDK_MOD1_MASK; +int PixFader::extra_fine_scale_modifier = GDK_MOD1_MASK; PixFader::PixFader (Glib::RefPtr<Pixbuf> belt, Gtk::Adjustment& adj) : adjustment (adj), @@ -134,7 +134,7 @@ PixFader::on_button_release_event (GdkEventButton* ev) if (ev->state & Gdk::SHIFT_MASK) { adjustment.set_value (default_value); - } else if (ev->state & GDK_CONTROL_MASK) { + } else if (ev->state & fine_scale_modifier) { adjustment.set_value (adjustment.get_lower()); } else if (ev->y < view.height - display_height()) { /* above the current display height, remember X Window coords */ @@ -172,15 +172,15 @@ bool PixFader::on_scroll_event (GdkEventScroll* ev) { double scale; - - if (ev->state & GDK_CONTROL_MASK) { - if (ev->state & GDK_MOD1_MASK) { - scale = 0.05; + + if (ev->state & fine_scale_modifier) { + if (ev->state & extra_fine_scale_modifier) { + scale = 0.01; } else { - scale = 0.1; + scale = 0.05; } } else { - scale = 0.5; + scale = 0.25; } switch (ev->direction) { diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 5514dfaea8..d84d1ca030 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -201,7 +201,7 @@ echo "Copying other stuff to Ardour2.app ..." cp ../../gtk2_ardour/ergonomic-us.bindings $Resources cp ../../gtk2_ardour/mnemonic-us.bindings $Resources -cp ../../gtk2_ardour/sae-de.bindings $Resources +cp ../../gtk2_ardour/SAE-de.bindings $Resources cp ../../gtk2_ardour/ardour.menus $Resources cp ../../gtk2_ardour/ardour-sae.menus $Resources cp ../../ardour_system.rc $Resources |