smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-29 09:57:44 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3067 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2008-02-15 21:56:25 +00:00
parent c15da55cb8
commit cdd8ef7fc8
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/gtkmm2ext/gtkmm2ext/pixfader.h
View file

@ -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;
};

20
libs/gtkmm2ext/pixfader.cc
View file

@ -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) {

2
tools/osx_packaging/osx_build
View file

@ -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