Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-30 04:55:29 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Mac OS: Fix for STR#3268 where a fullscreen window could become relocated

Browse Source 
behind the menu bar and dock.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10975 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy
2015-12-21 13:38:49 +00:00
parent 9c2a7e4a72
commit 25fc85190e
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+2
View File
@@ -104,6 +104,8 @@ CHANGES IN FLTK 1.3.4 RELEASED: ??? ?? ????
window has been show()n. window has been show()n.
- Fixed an error on the Mac platform when drawing to an Fl_Image_Surface - Fixed an error on the Mac platform when drawing to an Fl_Image_Surface
object without using the Fl_Image_Surface::draw() method. 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 CHANGES IN FLTK 1.3.3 RELEASED: Nov 03 2014
src/Fl_cocoa.mm
+3 -2
View File
@@ -1379,8 +1379,9 @@ static FLWindowDelegate *flwindowdelegate_instance = nil;
FLWindow *nsw = (FLWindow*)[notif object]; FLWindow *nsw = (FLWindow*)[notif object];
Fl_Window *window = [nsw getFl_Window]; Fl_Window *window = [nsw getFl_Window];
/* Fullscreen windows obscure all other windows so we need to return /* Fullscreen windows obscure all other windows so we need to return
to a "normal" level when the user switches to another window */ to a "normal" level when the user switches to another window,
if (window->fullscreen_active()) { unless this other window is above the fullscreen window */
if (window->fullscreen_active() && [NSApp keyWindow] && [[NSApp keyWindow] level] <= [nsw level]) {
[nsw setLevel:NSNormalWindowLevel]; [nsw setLevel:NSNormalWindowLevel];
fixup_window_levels(); fixup_window_levels();
} }