mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Refactor function get_float_from_selector - obsolete"

Browse Source 
This reverts commit 1b2632e7fa310b2d26948da9574ba770dbc714aa.
This commit is contained in:
Twinaphex 2016-01-15 13:03:40 +01:00
parent 1b2632e7fa
commit 26bcfa8d89
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/drivers_context/cocoa_gl_ctx.m
View File

@ -310,7 +310,7 @@ static bool cocoagl_gfx_ctx_set_video_mode(void *data,
return true; return true;
} }
void get_float_from_selector(RAScreen *screen, SEL selector, float *ret) static float cocoagl_gfx_ctx_get_scale_from_selector(RAScreen *screen, SEL selector, float *ret)
{ {
NSInvocation *invocation = [NSInvocation invocationWithMethodSignature: NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:
[[screen class] instanceMethodSignatureForSelector:selector]]; [[screen class] instanceMethodSignatureForSelector:selector]];
@ -318,6 +318,7 @@ void get_float_from_selector(RAScreen *screen, SEL selector, float *ret)
[invocation setTarget:screen]; [invocation setTarget:screen];
[invocation invoke]; [invocation invoke];
[invocation getReturnValue:ret]; [invocation getReturnValue:ret];
return *ret;
} }
float cocoagl_gfx_ctx_get_native_scale(void) float cocoagl_gfx_ctx_get_native_scale(void)
@ -336,10 +337,7 @@ float cocoagl_gfx_ctx_get_native_scale(void)
return 0.0f; return 0.0f;
if ([screen respondsToSelector:selector]) if ([screen respondsToSelector:selector])
{ return cocoagl_gfx_ctx_get_scale_from_selector(screen, selector, &ret);
get_float_from_selector(screen, selector, &ret);
return ret;
}
ret = 1.0f; ret = 1.0f;
if ([screen respondsToSelector:@selector(scale)]) if ([screen respondsToSelector:@selector(scale)])

11
ui/drivers/ui_cocoa.m
View File

@ -33,8 +33,7 @@
static id apple_platform; static id apple_platform;
extern void *get_chosen_screen(void); void *get_chosen_screen(void);
extern void get_float_from_selector(RAScreen *screen, SEL selector, float *ret);
void apple_rarch_exited(void) void apple_rarch_exited(void)
{ {
@ -108,14 +107,13 @@ void apple_rarch_exited(void)
{ {
NSPoint pos; NSPoint pos;
NSPoint mouse_pos; NSPoint mouse_pos;
float backing_scale_factor = 1.0f; CGFloat backing_scale_factor = 1.0f;
#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
SEL selector = NSSelectorFromString(BOXSTRING("backingScaleFactor"));
apple = (cocoa_input_data_t*)input_driver_get_data(); apple = (cocoa_input_data_t*)input_driver_get_data();
if (!apple) if (!apple)
@ -127,8 +125,9 @@ void apple_rarch_exited(void)
apple->mouse_rel_x = event.deltaX; apple->mouse_rel_x = event.deltaX;
apple->mouse_rel_y = event.deltaY; apple->mouse_rel_y = event.deltaY;
if ([screen respondsToSelector:selector]) #if MAC_OS_X_VERSION_10_7
get_float_from_selector(screen, selector, &backing_scale_factor); backing_scale_factor = screen.backingScaleFactor;
#endif
/* Absolute */ /* Absolute */
pos = [[CocoaView get] convertPoint:[event locationInWindow] fromView:nil]; pos = [[CocoaView get] convertPoint:[event locationInWindow] fromView:nil];