From 69a38f9b9f4d6890f9b3a54f764b72e5db72a650 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Sun, 22 Sep 2019 07:41:56 +0200 Subject: [PATCH] (Cocoa) Pass direct pointer to UI companion driver window title function --- gfx/drivers_context/cocoa_gl_ctx.m | 7 +++---- ui/drivers/cocoa/ui_cocoa_window.m | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m index 40c2363f9d..638e90686c 100644 --- a/gfx/drivers_context/cocoa_gl_ctx.m +++ b/gfx/drivers_context/cocoa_gl_ctx.m @@ -348,13 +348,12 @@ float cocoagl_gfx_ctx_get_native_scale(void) #if defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL) 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(); #if defined(HAVE_COCOA) - view.data = (CocoaView*)nsview_get_ptr(); + void *_data = (CocoaView*)nsview_get_ptr(); #elif defined(HAVE_COCOA_METAL) - view.data = (BRIDGE void *)apple_platform.renderView; + void *_data = (BRIDGE void *)apple_platform.renderView; #endif 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)); if (title[0]) - window->set_title(&view, title); + window->set_title(_data, title); } } #endif diff --git a/ui/drivers/cocoa/ui_cocoa_window.m b/ui/drivers/cocoa/ui_cocoa_window.m index ac5406b039..c44a7b9bb2 100644 --- a/ui/drivers/cocoa/ui_cocoa_window.m +++ b/ui/drivers/cocoa/ui_cocoa_window.m @@ -59,8 +59,7 @@ static void ui_window_cocoa_set_visible(void *data, 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*)cocoa->data; + CocoaView *cocoa_view = (BRIDGE CocoaView*)data; const char* const text = buf; /* < Can't access buffer directly in the block */ [[cocoa_view window] setTitle:[NSString stringWithCString:text encoding:NSUTF8StringEncoding]]; }