ardour/livetrax
13
0
Fork 0
Code

ArdourDialog and ArdourWindow don't change magic widget focus

Browse Source
This commit is contained in:
Paul Davis 2015-04-01 12:44:35 -04:00
parent c94d352f56
commit 57613dc0cc
2 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk2_ardour/ardour_dialog.cc
View File

@ -66,12 +66,7 @@ ArdourDialog::~ArdourDialog ()
bool
ArdourDialog::on_focus_in_event (GdkEventFocus *ev)
{
if (Keyboard::some_magic_widget_has_focus()) {
Keyboard::magic_widget_drop_focus ();
}
Keyboard::the_keyboard().focus_in_window (ev, this);
Keyboard::magic_widget_grab_focus ();
return Dialog::on_focus_in_event (ev);
}
@ -79,7 +74,6 @@ bool
ArdourDialog::on_focus_out_event (GdkEventFocus *ev)
{
if (!get_modal()) {
Keyboard::magic_widget_drop_focus ();
Keyboard::the_keyboard().focus_out_window (ev, this);
}
return Dialog::on_focus_out_event (ev);
@ -88,16 +82,6 @@ ArdourDialog::on_focus_out_event (GdkEventFocus *ev)
void
ArdourDialog::on_unmap ()
{
if (Keyboard::some_magic_widget_has_focus()) {
Gtk::Widget* widget = get_focus();
if (widget) {
Gtk::Window* win = static_cast<Gtk::Window*>(get_focus()->get_toplevel());
if (win == Keyboard::get_current_window()) {
Keyboard::magic_widget_drop_focus ();
}
}
}
Keyboard::the_keyboard().leave_window (0, this);
Dialog::on_unmap ();
}

16
gtk2_ardour/ardour_window.cc
View File

@ -71,12 +71,7 @@ ArdourWindow::on_key_press_event (GdkEventKey* ev)
bool
ArdourWindow::on_focus_in_event (GdkEventFocus *ev)
{
if (Keyboard::some_magic_widget_has_focus()) {
Keyboard::magic_widget_drop_focus ();
}
Keyboard::the_keyboard().focus_in_window (ev, this);
Keyboard::magic_widget_grab_focus ();
return Window::on_focus_in_event (ev);
}
@ -84,7 +79,6 @@ bool
ArdourWindow::on_focus_out_event (GdkEventFocus *ev)
{
if (!get_modal()) {
Keyboard::magic_widget_drop_focus ();
Keyboard::the_keyboard().focus_out_window (ev, this);
}
return Window::on_focus_out_event (ev);
@ -93,16 +87,6 @@ ArdourWindow::on_focus_out_event (GdkEventFocus *ev)
void
ArdourWindow::on_unmap ()
{
if (Keyboard::some_magic_widget_has_focus()) {
Gtk::Widget* widget = get_focus();
if (widget) {
Gtk::Window* win = static_cast<Gtk::Window*>(get_focus()->get_toplevel());
if (win == Keyboard::get_current_window()) {
Keyboard::magic_widget_drop_focus ();
}
}
}
Keyboard::the_keyboard().leave_window (0, this);
Window::on_unmap ();
}