diff options
author | Doug McLain <doug@nostar.net> | 2008-02-16 11:04:30 +0000 |
---|---|---|
committer | Doug McLain <doug@nostar.net> | 2008-02-16 11:04:30 +0000 |
commit | 805536fafa73f87b5c4b0f6463d68ac49163715b (patch) | |
tree | 8136ad1cb3a2284f1b5c9cac0965ba54fdbb462a | |
parent | 14f988c5cc803482b6e1c7ef1b67597852b4aab0 (diff) |
replace a typo with the result that led to the desired non-step behaviour on non-dragging clicks for horizontal sliders, so that the track can be selected by clicking on the fader without changing its position.
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3071 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r-- | gtk2_ardour/mixer_ui.cc | 2 | ||||
-rw-r--r-- | libs/gtkmm2ext/pixfader.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 6f191d6856..3484fddd38 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -64,7 +64,7 @@ Mixer_UI::Mixer_UI () : Window (Gtk::WINDOW_TOPLEVEL) { session = 0; - Config->get_default_narrow_ms() ? _strip_width = Narrow : _strip_width = Wide; + _strip_width = Config->get_default_narrow_ms() ? Narrow : Wide; track_menu = 0; mix_group_context_menu = 0; no_track_list_redisplay = false; diff --git a/libs/gtkmm2ext/pixfader.cc b/libs/gtkmm2ext/pixfader.cc index 7f7e959ca8..41203afb69 100644 --- a/libs/gtkmm2ext/pixfader.cc +++ b/libs/gtkmm2ext/pixfader.cc @@ -138,8 +138,8 @@ PixFader::on_button_release_event (GdkEventButton* ev) { double fract, ev_pos; - (_orien == VERT) ? ev_pos = ev->y : ev->x; - + ev_pos = (_orien == VERT) ? ev->y : 0; // Don't step if we are horizontal + switch (ev->button) { case 1: if (dragging) { @@ -238,7 +238,7 @@ PixFader::on_motion_notify_event (GdkEventMotion* ev) { if (dragging) { double fract, delta, scale, ev_pos; - (_orien == VERT) ? ev_pos = ev->y : ev_pos = ev->x; + ev_pos = (_orien == VERT) ? ev->y : ev->x; //cerr << "PixFader::on_motion_notify_event() called x:y = " << ev->x << ":" << ev->y; if (ev->window != grab_window) { grab_loc = ev_pos; |