From 25fc85190e48c5e0cdece97c90a3a291de9fd129 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Mon, 21 Dec 2015 13:38:49 +0000 Subject: 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 --- src/Fl_cocoa.mm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') 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(); } -- cgit v1.2.3