rework dialog-close-focus-reset change to work in Tabbed
This commit is contained in:
parent
21c3d17ae1
commit
25a24e0805
@ -88,7 +88,7 @@ ARDOUR_UI::create_editor ()
|
||||
return -1;
|
||||
}
|
||||
|
||||
editor->signal_event().connect (sigc::bind (sigc::ptr_fun (&Keyboard::catch_user_event_for_pre_dialog_focus), editor));
|
||||
// editor->signal_event().connect (sigc::bind (sigc::ptr_fun (&Keyboard::catch_user_event_for_pre_dialog_focus), editor));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -48,7 +48,7 @@ ARDOUR_UI::create_mixer ()
|
||||
return -1;
|
||||
}
|
||||
|
||||
mixer->signal_event().connect (sigc::bind (sigc::ptr_fun (&Gtkmm2ext::Keyboard::catch_user_event_for_pre_dialog_focus), mixer));
|
||||
// mixer->signal_event().connect (sigc::bind (sigc::ptr_fun (&Gtkmm2ext::Keyboard::catch_user_event_for_pre_dialog_focus), mixer));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -59,6 +59,7 @@
|
||||
#include "gtkmm2ext/bindings.h"
|
||||
#include "gtkmm2ext/grouped_buttons.h"
|
||||
#include "gtkmm2ext/gtk_ui.h"
|
||||
#include <gtkmm2ext/keyboard.h>
|
||||
#include "gtkmm2ext/utils.h"
|
||||
#include "gtkmm2ext/window_title.h"
|
||||
#include "gtkmm2ext/choice.h"
|
||||
@ -5856,6 +5857,7 @@ Editor::use_own_window (bool and_fill_it)
|
||||
ARDOUR_UI::instance()->setup_toplevel_window (*win, _("Editor"), this);
|
||||
|
||||
// win->signal_realize().connect (*this, &Editor::on_realize);
|
||||
win->signal_event().connect (sigc::bind (sigc::ptr_fun (&Keyboard::catch_user_event_for_pre_dialog_focus), win));
|
||||
win->signal_event().connect (sigc::mem_fun (*this, &Editor::generic_event_handler));
|
||||
win->set_data ("ardour-bindings", bindings);
|
||||
|
||||
|
@ -34,6 +34,7 @@
|
||||
#include <glibmm/threads.h>
|
||||
|
||||
#include <gtkmm2ext/gtk_ui.h>
|
||||
#include <gtkmm2ext/keyboard.h>
|
||||
#include <gtkmm2ext/utils.h>
|
||||
#include <gtkmm2ext/tearoff.h>
|
||||
#include <gtkmm2ext/window_title.h>
|
||||
@ -317,6 +318,7 @@ Mixer_UI::use_own_window (bool and_fill_it)
|
||||
win->set_name ("MixerWindow");
|
||||
ARDOUR_UI::instance()->setup_toplevel_window (*win, _("Mixer"), this);
|
||||
win->signal_scroll_event().connect (sigc::mem_fun (*this, &Mixer_UI::on_scroll_event), false);
|
||||
win->signal_event().connect (sigc::bind (sigc::ptr_fun (&Keyboard::catch_user_event_for_pre_dialog_focus), win));
|
||||
win->set_data ("ardour-bindings", bindings);
|
||||
update_title ();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user