From e1caf32817df57895f43b8667e7072790659e48d Mon Sep 17 00:00:00 2001 From: LibretroAdmin <105389611+LibretroAdmin@users.noreply.github.com> Date: Thu, 4 Aug 2022 17:56:26 +0200 Subject: [PATCH] Revert "Fixed items of system top menu bar on macOS. (#14271)" (#14279) This reverts commit 7068eebe0c59fea26a4fc176c769ef46fd3ad718. --- pkg/apple/OSX/en.lproj/MainMenu.xib | 4 +-- pkg/apple/OSX/en.lproj/MainMenu_Metal.xib | 4 +-- ui/drivers/ui_cocoa.m | 40 +---------------------- 3 files changed, 5 insertions(+), 43 deletions(-) diff --git a/pkg/apple/OSX/en.lproj/MainMenu.xib b/pkg/apple/OSX/en.lproj/MainMenu.xib index eb7046193a..5db4edfa08 100644 --- a/pkg/apple/OSX/en.lproj/MainMenu.xib +++ b/pkg/apple/OSX/en.lproj/MainMenu.xib @@ -104,7 +104,7 @@ - + @@ -185,7 +185,7 @@ - + diff --git a/pkg/apple/OSX/en.lproj/MainMenu_Metal.xib b/pkg/apple/OSX/en.lproj/MainMenu_Metal.xib index 45cca8488a..74760bc834 100644 --- a/pkg/apple/OSX/en.lproj/MainMenu_Metal.xib +++ b/pkg/apple/OSX/en.lproj/MainMenu_Metal.xib @@ -104,7 +104,7 @@ - + @@ -185,7 +185,7 @@ - + diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m index 424a814843..81bddae04f 100644 --- a/ui/drivers/ui_cocoa.m +++ b/ui/drivers/ui_cocoa.m @@ -332,33 +332,6 @@ static ui_application_t ui_application_cocoa = { "cocoa" }; -@interface CommandPerformer : NSObject -@end // @interface CommandPerformer - -@implementation CommandPerformer { - void *data; - enum event_command cmd; -} - -- (id)initWithData:(void *)data command:(enum event_command)cmd -{ - self = [super init]; - if (!self) - return self; - - self->data = data; - self->cmd = cmd; - - return self; -} - -- (void)perform -{ - command_event(self->cmd, self->data); -} - -@end // @implementation CommandPerformer - #if defined(HAVE_COCOA_METAL) @interface RAWindow : NSWindow @end @@ -904,12 +877,6 @@ static void open_document_handler( case 20: cmd = CMD_EVENT_FULLSCREEN_TOGGLE; break; - case 21: - cmd = CMD_EVENT_TAKE_SCREENSHOT; - break; - case 22: - cmd = CMD_EVENT_AUDIO_MUTE_TOGGLE; - break; default: break; } @@ -954,12 +921,7 @@ static void ui_companion_cocoa_deinit(void *data) static void *ui_companion_cocoa_init(void) { return (void*)-1; } static void ui_companion_cocoa_notify_content_loaded(void *data) { } static void ui_companion_cocoa_toggle(void *data, bool force) { } -static void ui_companion_cocoa_event_command(void *data, enum event_command cmd) -{ - id performer = [[CommandPerformer alloc] initWithData:data command:cmd]; - [performer performSelectorOnMainThread:@selector(perform) withObject:nil waitUntilDone:NO]; - [performer release]; -} +static void ui_companion_cocoa_event_command(void *data, enum event_command cmd) { } static void ui_companion_cocoa_notify_list_pushed(void *data, file_list_t *list, file_list_t *menu_list) { }