From c28080d44c18de05d1c2fbb26b94a364eb2463d8 Mon Sep 17 00:00:00 2001 From: jean-emmanuel Date: Thu, 14 Dec 2023 12:32:55 +0100 Subject: [PATCH] ui: mixer: remove duplicate handler that causes a bug where the "Add Track" dialog pops up upon double clickin anywhere on a vca strip --- gtk2_ardour/mixer_ui.cc | 18 ++---------------- gtk2_ardour/mixer_ui.h | 1 - 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 7a3f42dd00..4a48a17e88 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -350,13 +350,12 @@ Mixer_UI::Mixer_UI () vca_scroller_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); vca_scroller_base.set_name (X_("MixerWindow")); - vca_scroller_base.signal_button_release_event().connect (sigc::mem_fun(*this, &Mixer_UI::masters_scroller_button_release), false); + vca_scroller_base.signal_button_press_event().connect (sigc::mem_fun(*this, &Mixer_UI::strip_scroller_button_event)); + vca_scroller_base.signal_button_release_event().connect (sigc::mem_fun(*this, &Mixer_UI::strip_scroller_button_event)); vca_hpacker.signal_scroll_event().connect (sigc::mem_fun (*this, &Mixer_UI::on_vca_scroll_event), false); vca_scroller.add (vca_hpacker); vca_scroller.set_policy (Gtk::POLICY_ALWAYS, Gtk::POLICY_AUTOMATIC); - vca_scroller.signal_button_press_event().connect (sigc::mem_fun(*this, &Mixer_UI::strip_scroller_button_event)); - vca_scroller.signal_button_release_event().connect (sigc::mem_fun(*this, &Mixer_UI::strip_scroller_button_event)); vca_vpacker.pack_start (vca_scroller, true, true); @@ -540,19 +539,6 @@ Mixer_UI::remove_master (VCAMasterStrip* vms) } } -bool -Mixer_UI::masters_scroller_button_release (GdkEventButton* ev) -{ - using namespace Menu_Helpers; - - if (Keyboard::is_context_menu_event (ev)) { - ARDOUR_UI::instance()->add_route (); - return true; - } - - return false; -} - void Mixer_UI::new_masters_created () { diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h index f8c97bb3d3..e9e21cf795 100644 --- a/gtk2_ardour/mixer_ui.h +++ b/gtk2_ardour/mixer_ui.h @@ -234,7 +234,6 @@ private: void scroller_drag_data_received (const Glib::RefPtr&, int, int, const Gtk::SelectionData&, guint, guint); bool strip_scroller_button_event (GdkEventButton*); - bool masters_scroller_button_release (GdkEventButton*); void scroll_left (); void scroll_right (); void vca_scroll_left ();