ardour/livetrax
13
0
Fork 0
Code

fix use of DIALOG/UTILITY window type hint on OS X.

Browse Source 
See code comments for details
This commit is contained in:
Paul Davis 2016-04-13 12:59:56 -04:00
parent ea17875c36
commit 4cc1286064
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk2_ardour/ardour_window.cc
View File

@ -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();