mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-16 11:46:25 +01:00
ui: mixer: remove duplicate handler that causes a bug where the "Add Track" dialog pops up upon double clickin anywhere on a vca strip
This commit is contained in:
parent
ba279e2e67
commit
c28080d44c
2 changed files with 2 additions and 17 deletions
|
|
@ -350,13 +350,12 @@ Mixer_UI::Mixer_UI ()
|
||||||
|
|
||||||
vca_scroller_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
|
vca_scroller_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
|
||||||
vca_scroller_base.set_name (X_("MixerWindow"));
|
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_hpacker.signal_scroll_event().connect (sigc::mem_fun (*this, &Mixer_UI::on_vca_scroll_event), false);
|
||||||
vca_scroller.add (vca_hpacker);
|
vca_scroller.add (vca_hpacker);
|
||||||
vca_scroller.set_policy (Gtk::POLICY_ALWAYS, Gtk::POLICY_AUTOMATIC);
|
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);
|
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
|
void
|
||||||
Mixer_UI::new_masters_created ()
|
Mixer_UI::new_masters_created ()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -234,7 +234,6 @@ private:
|
||||||
|
|
||||||
void scroller_drag_data_received (const Glib::RefPtr<Gdk::DragContext>&, int, int, const Gtk::SelectionData&, guint, guint);
|
void scroller_drag_data_received (const Glib::RefPtr<Gdk::DragContext>&, int, int, const Gtk::SelectionData&, guint, guint);
|
||||||
bool strip_scroller_button_event (GdkEventButton*);
|
bool strip_scroller_button_event (GdkEventButton*);
|
||||||
bool masters_scroller_button_release (GdkEventButton*);
|
|
||||||
void scroll_left ();
|
void scroll_left ();
|
||||||
void scroll_right ();
|
void scroll_right ();
|
||||||
void vca_scroll_left ();
|
void vca_scroll_left ();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue