summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug McLain <doug@nostar.net>2008-02-23 02:58:03 +0000
committerDoug McLain <doug@nostar.net>2008-02-23 02:58:03 +0000
commit40f1d29f0200e32cdf4ec192527d622552ccfa5a (patch)
tree2a990fb6eedb05012be1cd37b99258cc40d21b09
parent0aabd293ba163c97bc2d73225782a53719ede02b (diff)
Fix the stepping direction for horizontal faders, it was stepping in the wrong direction, and comment the line that
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3113 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--gtk2_ardour/redirect_box.cc4
-rw-r--r--libs/gtkmm2ext/pixfader.cc2
2 files changed, 4 insertions, 2 deletions
diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc
index bc2d1e6341..0c72263de1 100644
--- a/gtk2_ardour/redirect_box.cc
+++ b/gtk2_ardour/redirect_box.cc
@@ -402,7 +402,9 @@ RedirectBox::insert_plugin_chosen (boost::shared_ptr<Plugin> plugin)
if (_route->add_redirect (redirect, this, &err_streams)) {
weird_plugin_dialog (*plugin, err_streams, _route);
} else {
- redirect->set_active (true, 0);
+ if (Profile->get_sae()) {
+ redirect->set_active (true, 0);
+ }
redirect->active_changed.connect (bind (mem_fun (*this, &RedirectBox::show_redirect_active_r), boost::weak_ptr<Redirect>(redirect)));
}
}
diff --git a/libs/gtkmm2ext/pixfader.cc b/libs/gtkmm2ext/pixfader.cc
index c138d13371..5d228e1821 100644
--- a/libs/gtkmm2ext/pixfader.cc
+++ b/libs/gtkmm2ext/pixfader.cc
@@ -154,7 +154,7 @@ PixFader::on_button_release_event (GdkEventButton* ev)
adjustment.set_value (default_value);
} else if (ev->state & fine_scale_modifier) {
adjustment.set_value (adjustment.get_lower());
- } else if (ev_pos < span - display_span()) {
+ } else if ((_orien == VERT && ev_pos < span - display_span()) || (_orien == HORIZ && ev_pos > span - display_span())) {
/* above the current display height, remember X Window coords */
adjustment.set_value (adjustment.get_value() + adjustment.get_step_increment());
} else {