diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2024-11-04 06:28:02 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2024-11-04 06:28:02 +0100 |
| commit | 5e91ecfd58708e101860ce33e25a9651652c5cd6 (patch) | |
| tree | 7ef26267bd79f6c43c5af164ff893f360cd89257 /src/Fl_cocoa.mm | |
| parent | 37144c06a1eafbd6c4398cffa3fb4db1e1dfadb8 (diff) | |
Fix Mac: Fl_Window::fullscreen() doesn't work for unfocused tabbed window (#1101)
Diffstat (limited to 'src/Fl_cocoa.mm')
| -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 aadb98961..ae40df446 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -3282,7 +3282,10 @@ void Fl_Cocoa_Window_Driver::fullscreen_on() { #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 if (fl_mac_os_version >= 100700 && pWindow->border()) { # if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 - FLWindow *nswin = fl_xid(pWindow); + 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]; +# endif [nswin toggleFullScreen:nil]; # endif } else if (fl_mac_os_version >= 100600) { @@ -3370,7 +3373,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_6 if (fl_mac_os_version >= 100700 && pWindow->border()) { # if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 - FLWindow *nswin = fl_xid(pWindow); + 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]; +# endif [nswin toggleFullScreen:nil]; # endif } else if (fl_mac_os_version >= 100600) { |