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

Fix incorrect merge conflict resolution

Browse Source
This commit is contained in:
Chris Thrasher 2024-08-22 22:37:49 -06:00 committed by Lukas Dürrenberger
parent e192d6e6f8
commit 6589d5a847
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/SFML/Window/macOS/cg_sf_conversion.mm
View File

@ -69,8 +69,8 @@ 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
auto size = Vector2u(Vector2(CGDisplayModeGetWidth(cgmode), CGDisplayModeGetHeight(cgmode))); auto size = Vector2u(Vector2(CGDisplayModeGetPixelWidth(cgmode), CGDisplayModeGetPixelHeight(cgmode)));
scaleOutXY(size, nil); scaleInXY(size, nil);
return VideoMode(size, modeBitsPerPixel(cgmode)); return VideoMode(size, modeBitsPerPixel(cgmode));
} }