From cee3780f716be2ac95c35c8fb4129eed51956e4c Mon Sep 17 00:00:00 2001 From: relikd Date: Fri, 4 Oct 2019 01:50:56 +0200 Subject: [PATCH] Fix crash on macOS 10.14 --- baRSS/Helper/DrawImage.m | 13 +++++-------- baRSS/Info.plist | 4 ++-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/baRSS/Helper/DrawImage.m b/baRSS/Helper/DrawImage.m index eded289..610806f 100644 --- a/baRSS/Helper/DrawImage.m +++ b/baRSS/Helper/DrawImage.m @@ -312,17 +312,14 @@ static void Register(CGFloat size, NSImageName name, NSString *description, BOOL /// Register all icons that require custom drawing in @c ImageNamed cache void RegisterImageViewNames(void) { - const CGColorRef black = [NSColor controlTextColor].CGColor; - NSColor* const orange = [NSColor colorWithCalibratedRed:251/255.f green:163/255.f blue:58/255.f alpha:1.f]; // #FBA33A - - Register(16, RSSImageDefaultRSSIcon, NSLocalizedString(@"RSS icon", nil), ^(NSRect r) { DrawRSSGradientIcon(r, orange); return YES; }); - Register(16, RSSImageSettingsGlobal, NSLocalizedString(@"Global settings", nil), ^(NSRect r) { DrawGlobalIcon(r, black, NO); return YES; }); - Register(16, RSSImageSettingsGroup, NSLocalizedString(@"Group settings", nil), ^(NSRect r) { DrawGroupIcon(r, black, NO); return YES; }); - Register(16, RSSImageSettingsFeed, NSLocalizedString(@"Feed settings", nil), ^(NSRect r) { DrawRSSIcon(r, black, NO, YES); return YES; }); - + NSColor *orange = [NSColor colorWithCalibratedRed:251/255.f green:163/255.f blue:58/255.f alpha:1.f]; // #FBA33A NSColor *c1 = UserPrefsColor(Pref_colorStatusIconTint, orange); NSColor *c2 = UserPrefsColor(Pref_colorUnreadIndicator, [NSColor systemBlueColor]); + Register(16, RSSImageDefaultRSSIcon, NSLocalizedString(@"RSS icon", nil), ^(NSRect r) { DrawRSSGradientIcon(r, orange); return YES; }); + Register(16, RSSImageSettingsGlobal, NSLocalizedString(@"Global settings", nil), ^(NSRect r) { DrawGlobalIcon(r, [NSColor controlTextColor].CGColor, NO); return YES; }); + Register(16, RSSImageSettingsGroup, NSLocalizedString(@"Group settings", nil), ^(NSRect r) { DrawGroupIcon(r, [NSColor controlTextColor].CGColor, NO); return YES; }); + Register(16, RSSImageSettingsFeed, NSLocalizedString(@"Feed settings", nil), ^(NSRect r) { DrawRSSIcon(r, [NSColor controlTextColor].CGColor, NO, YES); return YES; }); Register(16, RSSImageMenuBarIconActive, NSLocalizedString(@"RSS menu bar icon", nil), ^(NSRect r) { DrawRSSIcon(r, c1.CGColor, YES, YES); return YES; }); Register(16, RSSImageMenuBarIconPaused, NSLocalizedString(@"RSS menu bar icon, paused", nil), ^(NSRect r) { DrawRSSIcon(r, c1.CGColor, YES, NO); return YES; }); Register(14, RSSImageMenuItemUnread, NSLocalizedString(@"Unread icon", nil), ^(NSRect r) { DrawUnreadIcon(r, c2); return YES; }); diff --git a/baRSS/Info.plist b/baRSS/Info.plist index 8878795..61a806e 100644 --- a/baRSS/Info.plist +++ b/baRSS/Info.plist @@ -45,7 +45,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.0 + 1.0.1 CFBundleURLTypes @@ -70,7 +70,7 @@ CFBundleVersion - 14394 + 14405 LSApplicationCategoryType public.app-category.news LSMinimumSystemVersion