From 6589d5a847ffaa03215e68eedeac6d0e7f74aed8 Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Thu, 22 Aug 2024 22:37:49 -0600 Subject: [PATCH] Fix incorrect merge conflict resolution --- src/SFML/Window/macOS/cg_sf_conversion.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SFML/Window/macOS/cg_sf_conversion.mm b/src/SFML/Window/macOS/cg_sf_conversion.mm index 92844747d..7c9f39d37 100644 --- a/src/SFML/Window/macOS/cg_sf_conversion.mm +++ b/src/SFML/Window/macOS/cg_sf_conversion.mm @@ -69,8 +69,8 @@ VideoMode convertCGModeToSFMode(CGDisplayModeRef cgmode) // // [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 - auto size = Vector2u(Vector2(CGDisplayModeGetWidth(cgmode), CGDisplayModeGetHeight(cgmode))); - scaleOutXY(size, nil); + auto size = Vector2u(Vector2(CGDisplayModeGetPixelWidth(cgmode), CGDisplayModeGetPixelHeight(cgmode))); + scaleInXY(size, nil); return VideoMode(size, modeBitsPerPixel(cgmode)); }