diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2024-11-18 18:01:57 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2024-11-18 18:01:57 +0100 |
| commit | 180b4bad2e23279ad9790518fc8e09253eb29275 (patch) | |
| tree | 8bdb9cb14e60f7ffe6f2e5e72a4dd6f9f5e82136 | |
| parent | 2cd0ec7e33e567ca9fe1ad1f83d2c8066725eb29 (diff) | |
Fix: Fullscreen regression between release-1.4.0rc2 and release-1.4.0rc3 on macOS( #1129)
| -rw-r--r-- | src/Fl_cocoa.mm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index ae40df446..6e16ac02a 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -3284,7 +3284,10 @@ void Fl_Cocoa_Window_Driver::fullscreen_on() { # if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 NSWindow *nswin = fl_xid(pWindow); # if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_13 - if (fl_mac_os_version >= 101300) nswin = [[nswin tabGroup] selectedWindow]; + if (fl_mac_os_version >= 101300) { + NSWindow *active_tab = [[nswin tabGroup] selectedWindow]; + if (active_tab) nswin = active_tab; + } # endif [nswin toggleFullScreen:nil]; # endif @@ -3375,7 +3378,10 @@ void Fl_Cocoa_Window_Driver::fullscreen_off(int X, int Y, int W, int H) { # if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 NSWindow *nswin = fl_xid(pWindow); # if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_13 - if (fl_mac_os_version >= 101300) nswin = [[nswin tabGroup] selectedWindow]; + if (fl_mac_os_version >= 101300) { + NSWindow *active_tab = [[nswin tabGroup] selectedWindow]; + if (active_tab) nswin = active_tab; + } # endif [nswin toggleFullScreen:nil]; # endif |