diff options
| author | Manolo Gouy <Manolo> | 2018-09-03 15:47:48 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2018-09-03 15:47:48 +0000 |
| commit | ee3fbb849e0a58365bdfd0d4858f7a9b8621e76a (patch) | |
| tree | 4d2ef3ad68d815b39df4875a7322ed7dfa43f910 | |
| parent | 821be0b0ebcb78316604c4355b4b01b4af2db47a (diff) | |
MacOS: fix creation of fullscreen GL window
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@13039 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/Fl_cocoa.mm | 2 | ||||
| -rw-r--r-- | src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 2e3adab39..d6ca855f2 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -2945,7 +2945,7 @@ Fl_X* Fl_Cocoa_Window_Driver::makeWindow() [cw center]; } else if (w->non_modal()) { [cw center]; - } else { + } else if (!w->fullscreen_active()) { static NSPoint delta = NSZeroPoint; delta = [cw cascadeTopLeftFromPoint:delta]; } diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx index 3dd9ac155..519979cda 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx +++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx @@ -256,8 +256,8 @@ void Fl_Cocoa_Window_Driver::fullscreen_on() { pWindow->_set_fullscreen(); /* On OS X < 10.6, it is necessary to recreate the window. This is done with hide+show. */ - hide(); - show(); + pWindow->hide(); + pWindow->show(); Fl::handle(FL_FULLSCREEN, pWindow); } |