ardour/livetrax
13
0
Fork 0
Code

manually revert most of previous commit related to dialog/main window focus management

Browse Source
This commit is contained in:
Paul Davis 2016-02-22 13:55:31 -05:00
parent 3a08ac5e1f
commit 60c4b30b7e
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk2_ardour/ardour_ui.cc
View File

@ -391,8 +391,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
keyboard->set_state (*node, Stateful::loading_state_version);
}
keyboard->GrabFocus.connect (sigc::mem_fun (*this, &ARDOUR_UI::grab_focus_after_dialog));
/* we don't like certain modifiers */
Bindings::set_ignored_state (GDK_LOCK_MASK|GDK_MOD2_MASK|GDK_MOD3_MASK);
@ -5070,13 +5068,3 @@ ARDOUR_UI::cancel_solo ()
_session->clear_all_solo_state (_session->get_routes()); // safeguard, ideally this won't do anything, check the log-window
}
}
void
ARDOUR_UI::grab_focus_after_dialog ()
{
if (mixer && mixer->fully_visible()) {
mixer->grab_focus ();
} else if (editor) {
editor->grab_focus ();
}
}

1
libs/gtkmm2ext/gtkmm2ext/keyboard.h
View File

@ -179,7 +179,6 @@ class LIBGTKMM2EXT_API Keyboard : public sigc::trackable, PBD::Stateful
};
sigc::signal0<void> ZoomVerticalModifierReleased;
sigc::signal0<void> GrabFocus;
protected:
static Keyboard* _the_keyboard;