From 5eed090e9cf56789d5472c316fde39dd46e1291f Mon Sep 17 00:00:00 2001 From: relikd Date: Mon, 21 Jul 2025 00:34:25 +0200 Subject: [PATCH] fix: macOS 15 ignores alternate item, remove isMainMenu --- baRSS/Status Bar Menu/NSMenu+Ext.h | 1 - baRSS/Status Bar Menu/NSMenu+Ext.m | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/baRSS/Status Bar Menu/NSMenu+Ext.h b/baRSS/Status Bar Menu/NSMenu+Ext.h index d556944..9b446f0 100644 --- a/baRSS/Status Bar Menu/NSMenu+Ext.h +++ b/baRSS/Status Bar Menu/NSMenu+Ext.h @@ -6,7 +6,6 @@ NS_ASSUME_NONNULL_BEGIN @interface NSMenu (Ext) @property (nonnull, copy, readonly) NSString *titleIndexPath; @property (nullable, readonly) NSMenuItem* parentItem; -@property (readonly) BOOL isMainMenu; @property (readonly) BOOL isFeedMenu; // Generator diff --git a/baRSS/Status Bar Menu/NSMenu+Ext.m b/baRSS/Status Bar Menu/NSMenu+Ext.m index e37f116..2f84960 100644 --- a/baRSS/Status Bar Menu/NSMenu+Ext.m +++ b/baRSS/Status Bar Menu/NSMenu+Ext.m @@ -36,9 +36,6 @@ typedef NS_ENUM(NSInteger, MenuItemTag) { return [self.supermenu itemAtIndex:[self.supermenu indexOfItemWithSubmenu:self]]; } -/// @return @c YES if menu is status bar menu. -- (BOOL)isMainMenu { return (self.supermenu == nil); } - /// @return @c YES if menu contains feed articles only. - (BOOL)isFeedMenu { return ([self.title characterAtIndex:0] == 'F'); } @@ -138,7 +135,7 @@ typedef NS_ENUM(NSInteger, MenuItemTag) { static NSString* const mr[] = {Pref_globalMarkRead, Pref_groupMarkRead, Pref_feedMarkRead}; static NSString* const mu[] = {Pref_globalMarkUnread, Pref_groupMarkUnread, Pref_feedMarkUnread}; static NSString* const ou[] = {Pref_globalOpenUnread, Pref_groupOpenUnread, Pref_feedOpenUnread}; - int i = (self.isMainMenu ? 0 : (self.isFeedMenu ? 2 : 1)); + int i = (self.supermenu == nil ? 0 : (self.isFeedMenu ? 2 : 1)); switch (tag) { case TagMarkAllRead: return UserPrefsBool(mr[i]); case TagMarkAllUnread: return UserPrefsBool(mu[i]);