mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-28 22:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix how macOS fullscreen video modes are detected

Browse Source 
Co-authored-by: Lorenzooone <lollo.lollo.rbiz@gmail.com>
This commit is contained in:
Chris Thrasher 2023-12-18 17:16:42 -06:00
parent 50ced215d0
commit c6e0f1ad2b
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SFML/Window/OSX/SFWindowController.mm
View File

@ -181,7 +181,6 @@
{ {
// Create a screen-sized window on the main display // Create a screen-sized window on the main display
sf::VideoMode desktop = sf::VideoMode::getDesktopMode(); sf::VideoMode desktop = sf::VideoMode::getDesktopMode();
sf::priv::scaleInWidthHeight(desktop, nil);
NSRect windowRect = NSMakeRect(0, 0, desktop.width, desktop.height); NSRect windowRect = NSMakeRect(0, 0, desktop.width, desktop.height);
m_window = [[SFWindow alloc] initWithContentRect:windowRect m_window = [[SFWindow alloc] initWithContentRect:windowRect
styleMask:NSBorderlessWindowMask styleMask:NSBorderlessWindowMask
@ -448,7 +447,6 @@
// 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(); sf::VideoMode desktop = sf::VideoMode::getDesktopMode();
sf::priv::scaleInWidthHeight(desktop, nil);
width = std::min(width, desktop.width); width = std::min(width, desktop.width);
height = std::min(height, desktop.height); height = std::min(height, desktop.height);

7
src/SFML/Window/OSX/Scaling.h
View File

@ -57,13 +57,6 @@ void scaleIn(T& in, id<WindowImplDelegateProtocol> delegate)
in /= static_cast<T>(delegate ? [delegate displayScaleFactor] : getDefaultScaleFactor()); in /= static_cast<T>(delegate ? [delegate displayScaleFactor] : getDefaultScaleFactor());
} }
template <class T>
void scaleInWidthHeight(T& in, id<WindowImplDelegateProtocol> delegate)
{
scaleIn(in.width, delegate);
scaleIn(in.height, delegate);
}
template <class T> template <class T>
void scaleInXY(T& in, id<WindowImplDelegateProtocol> delegate) void scaleInXY(T& in, id<WindowImplDelegateProtocol> delegate)
{ {

8
src/SFML/Window/OSX/cg_sf_conversion.mm
View File

@ -28,6 +28,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Window/OSX/cg_sf_conversion.hpp> #include <SFML/Window/OSX/cg_sf_conversion.hpp>
#include <SFML/System/Err.hpp> #include <SFML/System/Err.hpp>
#include <SFML/System/Vector2.hpp>
#import <SFML/Window/OSX/Scaling.h> #import <SFML/Window/OSX/Scaling.h>
@ -95,11 +96,10 @@ VideoMode convertCGModeToSFMode(CGDisplayModeRef cgmode)
// //
// [1]: "APIs for Supporting High Resolution" > "Additions and Changes for OS X v10.8" // [1]: "APIs for Supporting High Resolution" > "Additions and Changes for OS X v10.8"
// https://developer.apple.com/library/mac/documentation/GraphicsAnimation/Conceptual/HighResolutionOSX/APIs/APIs.html#//apple_ref/doc/uid/TP40012302-CH5-SW27 // https://developer.apple.com/library/mac/documentation/GraphicsAnimation/Conceptual/HighResolutionOSX/APIs/APIs.html#//apple_ref/doc/uid/TP40012302-CH5-SW27
VideoMode mode(static_cast<unsigned int>(CGDisplayModeGetWidth(cgmode)), static_cast<unsigned int>(CGDisplayModeGetHeight(cgmode)), static_cast<unsigned int>(modeBitsPerPixel(cgmode))); Vector2u size = Vector2u(Vector2<size_t>(CGDisplayModeGetPixelWidth(cgmode), CGDisplayModeGetPixelHeight(cgmode)));
scaleOutWidthHeight(mode, nil); scaleInXY(size, nil);
return mode; return VideoMode(size.x, size.y, static_cast<unsigned int>(modeBitsPerPixel(cgmode)));
} }
} // namespace priv } // namespace priv
} // namespace sf } // namespace sf