os x: an initial attempt at fixing loss of keyboard focus after cmd-w to close dialog

1 files changed, 8 insertions, 0 deletions

diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc
index d59fe014ce..c1a279cce6 100644
--- a/libs/gtkmm2ext/keyboard.cc
+++ b/libs/gtkmm2ext/keyboard.cc
@@ -432,6 +432,14 @@ Keyboard::close_current_dialog ()
 	if (current_window) {
 		current_window->hide ();
 		current_window = 0;
+#ifdef __APPLE__
+		/* Since Apple users has a basically unconfigurable window
+		   manager, and since users there cannot use
+		   focus-follows-mouse, we force focus back to some application
+		   "main window" after closing a dialog via Primary-w.
+		*/
+		GrabFocus ();
+#endif
 	}
 }