mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Merge c5d43b433b into 8c395ed67c

pull/12699/merge
Gloria 2024-11-16 15:10:11 +08:00 committed by GitHub
parent 8c395ed67c c5d43b433b
commit 24130c967b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/video/cocoa/cocoa_v.mm
View File

@ -206,9 +206,6 @@ bool VideoDriver_Cocoa::ToggleFullscreen(bool full_screen)
if ([ this->window respondsToSelector:@selector(toggleFullScreen:) ]) { if ([ this->window respondsToSelector:@selector(toggleFullScreen:) ]) {
[ this->window performSelector:@selector(toggleFullScreen:) withObject:this->window ]; [ this->window performSelector:@selector(toggleFullScreen:) withObject:this->window ];
/* Hide the menu bar and the dock */
[ NSMenu setMenuBarVisible:!full_screen ];
this->UpdateVideoModes(); this->UpdateVideoModes();
InvalidateWindowClassesData(WC_GAME_OPTIONS, 3); InvalidateWindowClassesData(WC_GAME_OPTIONS, 3);
return true; return true;

2
src/video/cocoa/cocoa_wnd.mm
View File

@ -1300,7 +1300,7 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel
/** Presentation options to use for full screen mode. */ /** Presentation options to use for full screen mode. */
- (NSApplicationPresentationOptions)window:(NSWindow *)window willUseFullScreenPresentationOptions:(NSApplicationPresentationOptions)proposedOptions - (NSApplicationPresentationOptions)window:(NSWindow *)window willUseFullScreenPresentationOptions:(NSApplicationPresentationOptions)proposedOptions
{ {
return NSApplicationPresentationFullScreen | NSApplicationPresentationHideMenuBar | NSApplicationPresentationHideDock; return NSApplicationPresentationFullScreen | NSApplicationPresentationAutoHideMenuBar;
} }
@end @end