libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-04 16:26:25 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Fixed items of system top menu bar on macOS. (#14288)

Browse Source 
The second attempt.
This reverts commit e1caf32817df57895f43b8667e7072790659e48d.
This commit is contained in:
23rd 2022-08-24 04:57:43 +03:00 committed by GitHub
parent 620e048c52
commit 9663e4b4f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/apple/OSX/en.lproj/MainMenu.xib
View File

@ -104,7 +104,7 @@
<modifierMask key="keyEquivalentModifierMask"/> <modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Audio Options" id="661"> <menu key="submenu" title="Audio Options" id="661">
<items> <items>
<menuItem title="Mute Toggle" tag="11" id="663"> <menuItem title="Mute Toggle" tag="22" id="663">
<modifierMask key="keyEquivalentModifierMask"/> <modifierMask key="keyEquivalentModifierMask"/>
<connections> <connections>
<action selector="basicEvent:" target="494" id="664"/> <action selector="basicEvent:" target="494" id="664"/>
@ -185,7 +185,7 @@
<action selector="basicEvent:" target="494" id="627"/> <action selector="basicEvent:" target="494" id="627"/>
</connections> </connections>
</menuItem> </menuItem>
<menuItem title="Take Screenshot" tag="10" id="658"> <menuItem title="Take Screenshot" tag="21" id="658">
<modifierMask key="keyEquivalentModifierMask"/> <modifierMask key="keyEquivalentModifierMask"/>
<connections> <connections>
<action selector="basicEvent:" target="494" id="659"/> <action selector="basicEvent:" target="494" id="659"/>

4
pkg/apple/OSX/en.lproj/MainMenu_Metal.xib
View File

@ -104,7 +104,7 @@
<modifierMask key="keyEquivalentModifierMask"/> <modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Audio Options" id="661"> <menu key="submenu" title="Audio Options" id="661">
<items> <items>
<menuItem title="Mute Toggle" tag="11" id="663"> <menuItem title="Mute Toggle" tag="22" id="663">
<modifierMask key="keyEquivalentModifierMask"/> <modifierMask key="keyEquivalentModifierMask"/>
<connections> <connections>
<action selector="basicEvent:" target="494" id="664"/> <action selector="basicEvent:" target="494" id="664"/>
@ -185,7 +185,7 @@
<action selector="basicEvent:" target="494" id="627"/> <action selector="basicEvent:" target="494" id="627"/>
</connections> </connections>
</menuItem> </menuItem>
<menuItem title="Take Screenshot" tag="10" id="658"> <menuItem title="Take Screenshot" tag="21" id="658">
<modifierMask key="keyEquivalentModifierMask"/> <modifierMask key="keyEquivalentModifierMask"/>
<connections> <connections>
<action selector="basicEvent:" target="494" id="659"/> <action selector="basicEvent:" target="494" id="659"/>

40
ui/drivers/ui_cocoa.m
View File

@ -332,6 +332,33 @@ static ui_application_t ui_application_cocoa = {
"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) #if defined(HAVE_COCOA_METAL)
@interface RAWindow : NSWindow @interface RAWindow : NSWindow
@end @end
@ -877,6 +904,12 @@ static void open_document_handler(
case 20: case 20:
cmd = CMD_EVENT_FULLSCREEN_TOGGLE; cmd = CMD_EVENT_FULLSCREEN_TOGGLE;
break; break;
case 21:
cmd = CMD_EVENT_TAKE_SCREENSHOT;
break;
case 22:
cmd = CMD_EVENT_AUDIO_MUTE_TOGGLE;
break;
default: default:
break; break;
} }
@ -921,7 +954,12 @@ static void ui_companion_cocoa_deinit(void *data)
static void *ui_companion_cocoa_init(void) { return (void*)-1; } 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_notify_content_loaded(void *data) { }
static void ui_companion_cocoa_toggle(void *data, bool force) { } static void ui_companion_cocoa_toggle(void *data, bool force) { }
static void ui_companion_cocoa_event_command(void *data, enum event_command cmd) { } 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];
RELEASE(performer);
}
static void ui_companion_cocoa_notify_list_pushed(void *data, static void ui_companion_cocoa_notify_list_pushed(void *data,
file_list_t *list, file_list_t *menu_list) { } file_list_t *list, file_list_t *menu_list) { }