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;