mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-25 04:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.6.x' into feature/backmerge

Browse Source
This commit is contained in:
Chris Thrasher 2024-08-21 11:49:29 -06:00
commit 238cd2c56d
No known key found for this signature in database
GPG Key ID: 56FB686C9DFC8E2C
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/SFML/Window/macOS/SFWindowController.mm
View File

@ -173,10 +173,9 @@
- (void)setupFullscreenViewWithMode:(const sf::VideoMode&)mode - (void)setupFullscreenViewWithMode:(const sf::VideoMode&)mode
{ {
// Create a screen-sized window on the main display // Create a screen-sized window on the main display
sf::VideoMode desktop = sf::VideoMode::getDesktopMode(); const sf::VideoMode desktop = sf::VideoMode::getDesktopMode();
sf::priv::scaleInXY(desktop.size, nil); NSRect windowRect = NSMakeRect(0, 0, desktop.size.x, desktop.size.y);
NSRect windowRect = NSMakeRect(0, 0, desktop.size.x, desktop.size.y); m_window = [[SFWindow alloc]
m_window = [[SFWindow alloc]
initWithContentRect:windowRect initWithContentRect:windowRect
styleMask:NSBorderlessWindowMask styleMask:NSBorderlessWindowMask
backing:NSBackingStoreBuffered backing:NSBackingStoreBuffered
@ -433,8 +432,7 @@
{ {
// Special case when fullscreen: only resize the opengl view // Special case when fullscreen: only resize the opengl view
// and make sure the requested size is not bigger than the window. // and make sure the requested size is not bigger than the window.
sf::VideoMode desktop = sf::VideoMode::getDesktopMode(); const sf::VideoMode desktop = sf::VideoMode::getDesktopMode();
sf::priv::scaleInXY(desktop.size, nil);
size.x = std::min(size.x, desktop.size.x); size.x = std::min(size.x, desktop.size.x);
size.y = std::min(size.y, desktop.size.y); size.y = std::min(size.y, desktop.size.y);