CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-24 20:26:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
twinaphex 2016-01-16 13:29:33 +01:00
parent 9a38ec28b0
commit 14ec006412
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gfx/drivers_context/cocoa_gl_ctx.m
View File

@ -371,31 +371,30 @@ float cocoagl_gfx_ctx_get_native_scale(void)
static void cocoagl_gfx_ctx_get_video_size(void *data, unsigned* width, unsigned* height) static void cocoagl_gfx_ctx_get_video_size(void *data, unsigned* width, unsigned* height)
{ {
#if __has_feature(objc_arc) #if __has_feature(objc_arc)
RAScreen *screen = (__bridge RAScreen*)get_chosen_screen(); RAScreen *screen = (__bridge RAScreen*)get_chosen_screen();
#else #else
RAScreen *screen = (RAScreen*)get_chosen_screen(); RAScreen *screen = (RAScreen*)get_chosen_screen();
#endif #endif
CGRect size = screen.bounds; CGRect size = screen.bounds;
float screenscale = cocoagl_gfx_ctx_get_native_scale(); float screenscale = cocoagl_gfx_ctx_get_native_scale();
#if defined(HAVE_COCOA) #if defined(HAVE_COCOA)
CocoaView *g_view = (CocoaView*)nsview_get_ptr(); CocoaView *g_view = (CocoaView*)nsview_get_ptr();
#if MAC_OS_X_VERSION_10_7 #if MAC_OS_X_VERSION_10_7
NSRect backingBounds = [g_view convertRectToBacking:[g_view bounds]]; NSRect backingBounds = [g_view convertRectToBacking:[g_view bounds]];
GLsizei backingPixelWidth = (GLsizei)(backingBounds.size.width), GLsizei backingPixelWidth = (GLsizei)(backingBounds.size.width);
backingPixelHeight = (GLsizei)(backingBounds.size.height); GLsizei backingPixelHeight = (GLsizei)(backingBounds.size.height);
#else
CGRect cgrect = NSRectToCGRect([g_view frame]);
GLsizei backingPixelWidth = CGRectGetWidth(cgrect);
GLsizei backingPixelHeight = CGRectGetHeight(cgrect);
#endif
size = CGRectMake(0, 0, backingPixelWidth, backingPixelHeight);
#else #else
size = g_view.bounds; CGRect cgrect = NSRectToCGRect([g_view frame]);
GLsizei backingPixelWidth = CGRectGetWidth(cgrect);
GLsizei backingPixelHeight = CGRectGetHeight(cgrect);
#endif #endif
size = CGRectMake(0, 0, backingPixelWidth, backingPixelHeight);
*width = CGRectGetWidth(size) * screenscale; #else
*height = CGRectGetHeight(size) * screenscale; size = g_view.bounds;
#endif
*width = CGRectGetWidth(size) * screenscale;
*height = CGRectGetHeight(size) * screenscale;
} }
static void cocoagl_gfx_ctx_update_window_title(void *data) static void cocoagl_gfx_ctx_update_window_title(void *data)