From a5c83da8397f5b06326b0b951c687383afafb206 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 16 Jan 2016 16:14:25 +0100 Subject: [PATCH] Simplify cocoagl_gfx_ctx_get_video_size --- gfx/drivers_context/cocoa_gl_ctx.m | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m index c92616318f..fbb1f22a3b 100644 --- a/gfx/drivers_context/cocoa_gl_ctx.m +++ b/gfx/drivers_context/cocoa_gl_ctx.m @@ -374,14 +374,12 @@ static void cocoagl_gfx_ctx_get_video_size(void *data, unsigned* width, unsigned #if defined(HAVE_COCOA) CocoaView *g_view = (CocoaView*)nsview_get_ptr(); #if MAC_OS_X_VERSION_10_7 - NSRect backingBounds = [g_view convertRectToBacking:[g_view bounds]]; - GLsizei backingPixelWidth = (GLsizei)(backingBounds.size.width); - GLsizei backingPixelHeight = (GLsizei)(backingBounds.size.height); + CGRect cgrect = NSRectToCGRect([g_view convertRectToBacking:[g_view bounds]]); #else - CGRect cgrect = NSRectToCGRect([g_view frame]); + CGRect cgrect = NSRectToCGRect([g_view frame]); +#endif GLsizei backingPixelWidth = CGRectGetWidth(cgrect); GLsizei backingPixelHeight = CGRectGetHeight(cgrect); -#endif CGRect size = CGRectMake(0, 0, backingPixelWidth, backingPixelHeight); #else CGRect size = g_view.bounds;