dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/fontcache.cpp
#	src/openttd.cpp
#	src/os/macosx/font_osx.cpp
#	src/os/unix/font_unix.cpp
#	src/os/windows/font_win32.cpp
#	src/strings.cpp
This commit is contained in:
Jonathan G Rennison
2022-10-03 20:32:26 +01:00
parent 0818ce4ae7 f011a559d0
commit 23b974fb39
48 changed files with 897 additions and 828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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