ardour/livetrax
13
0
Fork 0
Code

more panner tweaks

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@1245 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2006-12-22 04:20:07 +00:00
parent bfffdca239
commit 585e491842
3 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk2_ardour/panner.cc
View File

@ -84,12 +84,12 @@ PannerBar::button_press (GdkEventButton* ev)
{
if (ev->button == 1 && ev->type == GDK_BUTTON_PRESS && ev->y < 10) {
if (ev->x < triangle_size) {
return true;
adjustment.set_value (adjustment.get_lower());
} else if (ev->x > (darea.get_width() - triangle_size)) {
return true;
adjustment.set_value (adjustment.get_upper());
} else if (ev->x > (darea.get_width()/2 - triangle_size) &&
ev->x < (darea.get_width()/2 + triangle_size)) {
return true;
adjustment.set_value (adjustment.get_lower() + ((adjustment.get_upper() - adjustment.get_lower()) / 2.0));
}
}
@ -99,22 +99,6 @@ PannerBar::button_press (GdkEventButton* ev)
bool
PannerBar::button_release (GdkEventButton* ev)
{
drop_grab();
if (ev->button == 1 && ev->type == GDK_BUTTON_RELEASE && ev->y < 10) {
if (ev->x < triangle_size) {
adjustment.set_value (adjustment.get_lower());
return true;
} else if (ev->x > (darea.get_width() - triangle_size)) {
adjustment.set_value (adjustment.get_upper());
return true;
} else if (ev->x > (darea.get_width()/2 - triangle_size) &&
ev->x < (darea.get_width()/2 + triangle_size)) {
adjustment.set_value (adjustment.get_lower() + ((adjustment.get_upper() - adjustment.get_lower()) / 2.0));
return true;
}
}
return BarController::button_release (ev);
}

19
libs/ardour/globals.cc
View File

@ -398,8 +398,14 @@ ARDOUR::get_system_data_path ()
{
string path;
path += DATA_DIR;
path += "/ardour2/";
char *envvar;
if ((envvar = getenv ("ARDOUR_DATA_PATH")) != 0) {
path = envvar;
} else {
path += DATA_DIR;
path += "/ardour2/";
}
return path;
}
@ -408,9 +414,14 @@ string
ARDOUR::get_system_module_path ()
{
string path;
char *envvar;
path += MODULE_DIR;
path += "/ardour2/";
if ((envvar = getenv ("ARDOUR_MODULE_PATH")) != 0) {
path = envvar;
} else {
path += MODULE_DIR;
path += "/ardour2/";
}
return path;
}

9
libs/gtkmm2ext/barcontroller.cc
View File

@ -95,6 +95,8 @@ BarController::drop_grab ()
bool
BarController::button_press (GdkEventButton* ev)
{
double fract;
if (binding_proxy.button_press_handler (ev)) {
return true;
}
@ -116,6 +118,9 @@ BarController::button_press (GdkEventButton* ev)
break;
case 2:
fract = ev->x / (darea.get_width() - 2.0);
adjustment.set_value (adjustment.get_lower() + fract * (adjustment.get_upper() - adjustment.get_lower()));
case 3:
break;
@ -130,8 +135,6 @@ BarController::button_press (GdkEventButton* ev)
bool
BarController::button_release (GdkEventButton* ev)
{
double fract;
drop_grab ();
switch (ev->button) {
@ -159,8 +162,6 @@ BarController::button_release (GdkEventButton* ev)
break;
case 2:
fract = ev->x / (darea.get_width() - 2.0);
adjustment.set_value (adjustment.get_lower() + fract * (adjustment.get_upper() - adjustment.get_lower()));
break;
case 3: