smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-09 15:15:41 +01:00
Code Issues Projects Releases Wiki Activity

fix merge conflict resolution error - use controls layout button press event handler (fixes dbl-click to add track)

Browse source
This commit is contained in:
Paul Davis 2014-09-04 10:49:38 -04:00
parent 7ee8dd4159
commit e29dc599a8
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gtk2_ardour/editor.cc
View file

@ -525,6 +525,7 @@ Editor::Editor ()
_group_tabs = new EditorGroupTabs (this);
controls_layout.set_name ("EditControlsBase");
controls_layout.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK|Gdk::SCROLL_MASK);
controls_layout.signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::edit_controls_button_press));
controls_layout.signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::edit_controls_button_release));
controls_layout.signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::control_layout_scroll), false);
@ -3582,7 +3583,7 @@ bool
Editor::edit_controls_button_press (GdkEventButton* ev)
{
if ( (ev->button == 1) && (ev->type == GDK_2BUTTON_PRESS) ) {
ARDOUR_UI::instance()->add_audio_track_instantly ();
ARDOUR_UI::instance()->add_audio_track_instantly ();
}
return true;