ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Cocoa) Pass direct pointer to UI companion driver window title function

This commit is contained in:
Twinaphex 2019-09-22 07:41:56 +02:00
parent c7fd375120
commit 69a38f9b9f
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/drivers_context/cocoa_gl_ctx.m
View File

@ -348,13 +348,12 @@ float cocoagl_gfx_ctx_get_native_scale(void)
#if defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL) #if defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL)
static void cocoagl_gfx_ctx_update_title(void *data, void *data2) static void cocoagl_gfx_ctx_update_title(void *data, void *data2)
{ {
ui_window_cocoa_t view;
const ui_window_t *window = ui_companion_driver_get_window_ptr(); const ui_window_t *window = ui_companion_driver_get_window_ptr();
#if defined(HAVE_COCOA) #if defined(HAVE_COCOA)
view.data = (CocoaView*)nsview_get_ptr(); void *_data = (CocoaView*)nsview_get_ptr();
#elif defined(HAVE_COCOA_METAL) #elif defined(HAVE_COCOA_METAL)
view.data = (BRIDGE void *)apple_platform.renderView; void *_data = (BRIDGE void *)apple_platform.renderView;
#endif #endif
if (window) if (window)
@ -366,7 +365,7 @@ static void cocoagl_gfx_ctx_update_title(void *data, void *data2)
video_driver_get_window_title(title, sizeof(title)); video_driver_get_window_title(title, sizeof(title));
if (title[0]) if (title[0])
window->set_title(&view, title); window->set_title(_data, title);
} }
} }
#endif #endif

3
ui/drivers/cocoa/ui_cocoa_window.m
View File

@ -59,8 +59,7 @@ static void ui_window_cocoa_set_visible(void *data,
static void ui_window_cocoa_set_title(void *data, char *buf) static void ui_window_cocoa_set_title(void *data, char *buf)
{ {
ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data; CocoaView *cocoa_view = (BRIDGE CocoaView*)data;
CocoaView *cocoa_view = (BRIDGE CocoaView*)cocoa->data;
const char* const text = buf; /* < Can't access buffer directly in the block */ const char* const text = buf; /* < Can't access buffer directly in the block */
[[cocoa_view window] setTitle:[NSString stringWithCString:text encoding:NSUTF8StringEncoding]]; [[cocoa_view window] setTitle:[NSString stringWithCString:text encoding:NSUTF8StringEncoding]];
} }