diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-04-01 12:44:35 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-04-01 12:44:35 -0400 |
commit | 57613dc0cc0d47b5eabeae45d369b8c221ea67f6 (patch) | |
tree | 98b2bc753790625c7ecfe308f8bd65050745d67f /gtk2_ardour | |
parent | c94d352f56270b6c93c66bcc3dc83cd49d5efccc (diff) |
ArdourDialog and ArdourWindow don't change magic widget focus
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/ardour_dialog.cc | 16 | ||||
-rw-r--r-- | gtk2_ardour/ardour_window.cc | 16 |
2 files changed, 0 insertions, 32 deletions
diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc index 12d595b0b0..b5a5f52b67 100644 --- a/gtk2_ardour/ardour_dialog.cc +++ b/gtk2_ardour/ardour_dialog.cc @@ -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 (); } diff --git a/gtk2_ardour/ardour_window.cc b/gtk2_ardour/ardour_window.cc index c15ca78c6b..808fcd9fd7 100644 --- a/gtk2_ardour/ardour_window.cc +++ b/gtk2_ardour/ardour_window.cc @@ -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 (); } |