|
@@ -2482,12 +2482,12 @@ bool Cocoa_CreateWindow(SDL_VideoDevice *_this, SDL_Window *window, SDL_Properti
|
|
|
|
|
|
|
|
[nswindow setTabbingMode:NSWindowTabbingModeDisallowed];
|
|
[nswindow setTabbingMode:NSWindowTabbingModeDisallowed];
|
|
|
|
|
|
|
|
- if (videodata.allow_spaces) {
|
|
|
|
|
- // we put fullscreen desktop windows in their own Space, without a toggle button or menubar, later
|
|
|
|
|
- if (window->flags & SDL_WINDOW_RESIZABLE) {
|
|
|
|
|
- // resizable windows are Spaces-friendly: they get the "go fullscreen" toggle button on their titlebar.
|
|
|
|
|
- [nswindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // we put fullscreen desktop windows in their own Space, without a toggle button or menubar, later
|
|
|
|
|
+ if ((window->flags & SDL_WINDOW_RESIZABLE) && videodata.allow_spaces) {
|
|
|
|
|
+ // resizable windows are Spaces-friendly: they get the "go fullscreen" toggle button on their titlebar.
|
|
|
|
|
+ [nswindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
|
|
|
|
|
+ } else {
|
|
|
|
|
+ [nswindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenNone];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// Create a default view for this window
|
|
// Create a default view for this window
|
|
@@ -2947,13 +2947,12 @@ void Cocoa_SetWindowResizable(SDL_VideoDevice *_this, SDL_Window *window, bool r
|
|
|
if (![listener isInFullscreenSpace] && ![listener isInFullscreenSpaceTransition]) {
|
|
if (![listener isInFullscreenSpace] && ![listener isInFullscreenSpaceTransition]) {
|
|
|
SetWindowStyle(window, GetWindowStyle(window));
|
|
SetWindowStyle(window, GetWindowStyle(window));
|
|
|
}
|
|
}
|
|
|
- if (videodata.allow_spaces) {
|
|
|
|
|
- if (resizable) {
|
|
|
|
|
- // resizable windows are Spaces-friendly: they get the "go fullscreen" toggle button on their titlebar.
|
|
|
|
|
- [nswindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
|
|
|
|
|
- } else {
|
|
|
|
|
- [nswindow setCollectionBehavior:NSWindowCollectionBehaviorManaged];
|
|
|
|
|
- }
|
|
|
|
|
|
|
+
|
|
|
|
|
+ if (resizable && videodata.allow_spaces) {
|
|
|
|
|
+ // resizable windows are Spaces-friendly: they get the "go fullscreen" toggle button on their titlebar.
|
|
|
|
|
+ [nswindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
|
|
|
|
|
+ } else {
|
|
|
|
|
+ [nswindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenNone];
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|