summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2015-12-21 13:38:49 +0000
committerManolo Gouy <Manolo>2015-12-21 13:38:49 +0000
commit25fc85190e48c5e0cdece97c90a3a291de9fd129 (patch)
tree81caae9413ec2ddde2554fc673434250f3c2bf06 /src
parent9c2a7e4a72103b5deec5971c444e460cc5c8b73d (diff)
Mac OS: Fix for STR#3268 where a fullscreen window could become relocated
behind the menu bar and dock. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10975 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/Fl_cocoa.mm5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 73a9a5f6f..7e2ce76fd 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -1379,8 +1379,9 @@ static FLWindowDelegate *flwindowdelegate_instance = nil;
FLWindow *nsw = (FLWindow*)[notif object];
Fl_Window *window = [nsw getFl_Window];
/* Fullscreen windows obscure all other windows so we need to return
- to a "normal" level when the user switches to another window */
- if (window->fullscreen_active()) {
+ to a "normal" level when the user switches to another window,
+ unless this other window is above the fullscreen window */
+ if (window->fullscreen_active() && [NSApp keyWindow] && [[NSApp keyWindow] level] <= [nsw level]) {
[nsw setLevel:NSNormalWindowLevel];
fixup_window_levels();
}