From 5128a16ead0a62a1608b59690db096abba02c948 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Wed, 8 Apr 2015 17:17:29 +0200 Subject: [PATCH] (iOS/OSX) Cleanups: don't use CGFloat (for OSX 10.4 backwards compatibility); use aple_gfx_ctx_get_native_scale for getting correct scale float size for iOS --- apple/common/apple_cocoa_common.m | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/apple/common/apple_cocoa_common.m b/apple/common/apple_cocoa_common.m index 7b15bf3837..c970b6abfc 100644 --- a/apple/common/apple_cocoa_common.m +++ b/apple/common/apple_cocoa_common.m @@ -512,18 +512,18 @@ static bool apple_gfx_ctx_get_metrics(void *data, enum display_metric_types type NSSize displayPixelSize = [[description objectForKey:NSDeviceSize] sizeValue]; CGSize displayPhysicalSize = CGDisplayScreenSize( [[description objectForKey:@"NSScreenNumber"] unsignedIntValue]); - CGFloat displayWidth = displayPixelSize.width; - CGFloat displayHeight = displayPixelSize.height; - CGFloat physicalWidth = displayPhysicalSize.width; - CGFloat physicalHeight = displayPhysicalSize.height; + float displayWidth = displayPixelSize.width; + float displayHeight = displayPixelSize.height; + float physicalWidth = displayPhysicalSize.width; + float physicalHeight = displayPhysicalSize.height; #elif defined(IOS) - CGFloat scale = [UIScreen mainScreen].scale; + float scale = apple_gfx_ctx_get_native_scale(); CGRect screenRect = [[UIScreen mainScreen] bounds]; - CGFloat displayWidth = screenRect.size.width; - CGFloat displayHeight = screenRect.size.height; - CGFloat physicalWidth = screenRect.size.width * scale; - CGFloat physicalHeight = screenRect.size.height * scale; + float displayWidth = screenRect.size.width; + float displayHeight = screenRect.size.height; + float physicalWidth = screenRect.size.width * scale; + float physicalHeight = screenRect.size.height * scale; #endif (void)displayHeight;