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

Merge pull request #10459 from AlexKornitzer/feature/cocoa-fix

Browse Source 
ui_cocoa: fix mouse input for cocoa
This commit is contained in:
Autechre 2020-04-17 01:49:38 +02:00 committed by GitHub
commit 51183787af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/drivers/ui_cocoa.m
View File

@ -139,6 +139,7 @@ static void app_terminate(void)
#if defined(HAVE_COCOA_METAL) #if defined(HAVE_COCOA_METAL)
pos = [apple_platform.renderView convertPoint:[event locationInWindow] fromView:nil]; pos = [apple_platform.renderView convertPoint:[event locationInWindow] fromView:nil];
#elif defined(HAVE_COCOA) #elif defined(HAVE_COCOA)
pos = [[CocoaView get] convertPoint:[event locationInWindow] fromView:nil];
#endif #endif
apple->touches[0].screen_x = (int16_t)pos.x; apple->touches[0].screen_x = (int16_t)pos.x;
apple->touches[0].screen_y = (int16_t)pos.y; apple->touches[0].screen_y = (int16_t)pos.y;
@ -172,6 +173,7 @@ static void app_terminate(void)
if (!apple || pos.y < 0) if (!apple || pos.y < 0)
return; return;
apple->mouse_buttons |= (1 << event.buttonNumber); apple->mouse_buttons |= (1 << event.buttonNumber);
apple->touch_count = 1;
} }
break; break;
case NSEventTypeLeftMouseUp: case NSEventTypeLeftMouseUp:
@ -431,10 +433,10 @@ static char** waiting_argv;
- (void)application:(NSApplication *)sender openFiles:(NSArray *)filenames - (void)application:(NSApplication *)sender openFiles:(NSArray *)filenames
{ {
if ((filenames.count == 1) && [filenames objectAtIndex:0]) if ((filenames.count == 1) && [filenames objectAtIndex:0])
{ {
struct retro_system_info *system = runloop_get_libretro_system_info(); struct retro_system_info *system = runloop_get_libretro_system_info();
NSString *__core = [filenames objectAtIndex:0]; NSString *__core = [filenames objectAtIndex:0];
const char *core_name = system->library_name; const char *core_name = system->library_name;
if (core_name) if (core_name)
@ -483,7 +485,7 @@ static void open_core_handler(ui_browser_window_state_t *state, bool result)
path_set(RARCH_PATH_CORE, state->result); path_set(RARCH_PATH_CORE, state->result);
ui_companion_event_command(CMD_EVENT_LOAD_CORE); ui_companion_event_command(CMD_EVENT_LOAD_CORE);
if (info if (info
&& info->load_no_content && info->load_no_content
&& set_supports_no_game_enable) && set_supports_no_game_enable)
{ {
@ -554,7 +556,7 @@ static void open_document_handler(
if (browser) if (browser)
{ {
ui_browser_window_state_t ui_browser_window_state_t
browser_state = {{0}}; browser_state = {{0}};
bool result = false; bool result = false;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();