diff options
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | src/Fl_cocoa.mm | 5 |
2 files changed, 5 insertions, 2 deletions
@@ -104,6 +104,8 @@ CHANGES IN FLTK 1.3.4 RELEASED: ??? ?? ???? window has been show()n. - Fixed an error on the Mac platform when drawing to an Fl_Image_Surface object without using the Fl_Image_Surface::draw() method. + - Fixed STR #3268 where a fullscreen window could become relocated behind + the menu bar and dock (Mac OS only). CHANGES IN FLTK 1.3.3 RELEASED: Nov 03 2014 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(); } |