diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-04-13 12:59:56 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-04-13 13:00:05 -0400 |
| commit | 4cc12860648a982040fedd29b333b9731d675fb8 (patch) | |
| tree | 1255bc7c402185824c576789a15489eba8cd8d8e | |
| parent | ea17875c36a0f480069db5f5456d9a7eaf2b3fd7 (diff) | |
fix use of DIALOG/UTILITY window type hint on OS X.
See code comments for details
| -rw-r--r-- | gtk2_ardour/ardour_window.cc | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/gtk2_ardour/ardour_window.cc b/gtk2_ardour/ardour_window.cc index 029f5f1c23..628999124f 100644 --- a/gtk2_ardour/ardour_window.cc +++ b/gtk2_ardour/ardour_window.cc @@ -106,21 +106,33 @@ ArdourWindow::init () set_border_width (10); add_events (Gdk::FOCUS_CHANGE_MASK); - /* ArdourWindows are not dialogs (they have no "OK" or "Close" button) but + /* ArdourWindows are not dialogs (they have no "OK" or "Close" button) but they should be considered part of the same "window level" as a dialog. This - works on X11 and Quartz, in that: + works on X11 in that: - (a) utility & dialog windows are considered to be part of the same level + (a) there are no window "levels" (b) they will float above normal windows without any particular effort (c) present()-ing them will make a utility float over a dialog or vice versa. + + Some X11 Window managers (e.g. KDE) get this wrong, and so we allow the user + to select what type of window hint is used. + + GTK+ on OS X uses different levels for DIALOG and UTILITY, and Cocoa has a bug/design + issue that it will not transfer keyboard focus across levels when hiding a window. + So on OS X, we use DIALOG for all ArdourWindows to ensure that keyboard focus + will return to the main window(s) when this window is hidden. */ +#ifdef __APPLE__ + set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG); +#else if (UIConfiguration::instance().get_all_floating_windows_are_dialogs()) { set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG); } else { set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY); } +#endif Gtk::Window* parent = WM::Manager::instance().transient_parent(); |