Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-20 12:41:27 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

macOS: restore building with SDK versions between 10.7 and 10.11

Browse Source
This commit is contained in:
ManoloFLTK
2025-02-05 18:36:16 +01:00
parent f785dc5303
commit ee9c09a056
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_cocoa.mm
+15 -9
View File
@@ -1510,7 +1510,7 @@ static FLWindowDelegate *flwindowdelegate_instance = nil;
/* Restore previous fullscreen level */
if (w->fullscreen_active()
# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
&& (fl_mac_os_version < 100700 || !(nsw.styleMask & NSWindowStyleMaskFullScreen))
&& (fl_mac_os_version < 100700 || !(nsw.styleMask & NSFullScreenWindowMask))
#endif
) {
[nsw setLevel:NSStatusWindowLevel];
@@ -3134,8 +3134,8 @@ static BOOL fullscreen_screen_border = NO;
void Fl_Window::fullscreen_screens_x(bool on_off) {
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
if (fl_mac_os_version >= 100700 && shown()) {
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12
if (fl_mac_os_version >= 101200 && shown()) {
if (on_off) i->xid.collectionBehavior |= NSWindowCollectionBehaviorFullScreenNone;
else i->xid.collectionBehavior &= ~NSWindowCollectionBehaviorFullScreenNone;
}
@@ -3165,11 +3165,16 @@ void Fl_Window::fullscreen_x() {
# endif
if (fl_mac_os_version >= 100600) {
# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
if (fl_mac_os_version >= 100700 && (i->xid.styleMask & NSWindowStyleMaskFullScreen)) {
if (fl_mac_os_version >= 100700 && (i->xid.styleMask & NSFullScreenWindowMask)) {
// from single-screen fullscreen to "All Screens" fullscreen, with border
i->xid.collectionBehavior &= ~NSWindowCollectionBehaviorFullScreenNone; // just transiently
# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12
if (fl_mac_os_version >= 101200) {
i->xid.collectionBehavior &= ~NSWindowCollectionBehaviorFullScreenNone; // just transiently
[i->xid toggleFullScreen:nil];
i->xid.collectionBehavior |= NSWindowCollectionBehaviorFullScreenNone;
} else
#endif
[i->xid toggleFullScreen:nil];
i->xid.collectionBehavior |= NSWindowCollectionBehaviorFullScreenNone;
if (no_fullscreen_w == 0) {
no_fullscreen_x = x();
no_fullscreen_y = y();
@@ -3222,7 +3227,7 @@ void Fl_Window::fullscreen_off_x(int X, int Y, int W, int H) {
_clear_fullscreen();
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
if (fl_mac_os_version >= 100700 && ([i->xid styleMask] & NSWindowStyleMaskFullScreen)) {
if (fl_mac_os_version >= 100700 && ([i->xid styleMask] & NSFullScreenWindowMask)) {
[i->xid toggleFullScreen:nil];
resize(no_fullscreen_x, no_fullscreen_y, no_fullscreen_w, no_fullscreen_h);
} else
@@ -3468,8 +3473,9 @@ void Fl_X::make(Fl_Window* w)
else [cw orderFront:nil];
if (w->fullscreen_active() && fl_mac_os_version >= 100700) {
if (w->fullscreen_screen_top >= 0) {
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
cw.collectionBehavior |= NSWindowCollectionBehaviorFullScreenNone;
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12
if (fl_mac_os_version >= 101200)
cw.collectionBehavior |= NSWindowCollectionBehaviorFullScreenNone;
#endif
w->no_fullscreen_x = w->x();
w->no_fullscreen_y = w->y();