(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

This commit is contained in:
Twinaphex 2015-04-08 17:17:29 +02:00
parent 5e97ace162
commit 5128a16ead

View File

@ -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;