From 51dd688801412e227c8337c07a88c0fbabaedce2 Mon Sep 17 00:00:00 2001 From: relikd Date: Fri, 17 Jan 2020 22:46:07 +0100 Subject: [PATCH] Tint with accent color --- CHANGELOG.md | 2 +- Cartfile | 2 +- Cartfile.resolved | 2 +- baRSS/Info.plist | 2 +- baRSS/NSCategories/NSColor+Ext.m | 12 ++++++++++-- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7053af8..4ec3a19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,9 +11,9 @@ and this project does adhere to [Semantic Versioning](https://semver.org/spec/v2 ## [1.1.0] - 2020-01-17 ### Added - *QuickLook*: Thumbnail previews for OPML files (QLOPML v1.3) +- *Status Bar Menu*: Tint menu bar icon with Accent color (macOS 10.14+) ### Fixed -- *Status Bar Menu*: Tint menu bar icon on macOS 10.14+ - Resolved Xcode warnings in Xcode 11 diff --git a/Cartfile b/Cartfile index d0c9e58..0f6212a 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "relikd/RSXML2" "v2.0.0" \ No newline at end of file +github "relikd/RSXML2" "f1a02fabbdece48e3f7835725c65a7589d98782f" \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved index 5c6dc66..1f29201 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "relikd/RSXML2" "v2.0.0" +github "relikd/RSXML2" "f1a02fabbdece48e3f7835725c65a7589d98782f" diff --git a/baRSS/Info.plist b/baRSS/Info.plist index 267155a..52ced42 100644 --- a/baRSS/Info.plist +++ b/baRSS/Info.plist @@ -70,7 +70,7 @@ CFBundleVersion - 14598 + 14603 LSApplicationCategoryType public.app-category.news LSMinimumSystemVersion diff --git a/baRSS/NSCategories/NSColor+Ext.m b/baRSS/NSCategories/NSColor+Ext.m index 8cb9daf..020f93b 100644 --- a/baRSS/NSCategories/NSColor+Ext.m +++ b/baRSS/NSCategories/NSColor+Ext.m @@ -38,7 +38,11 @@ static NSColor *color; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - color = UserPrefsColor(Pref_colorStatusIconTint, [self rssOrange]); + if (@available(macOS 10.14, *)) { + color = UserPrefsColor(Pref_colorStatusIconTint, [NSColor controlAccentColor]); + } else { + color = UserPrefsColor(Pref_colorStatusIconTint, [self rssOrange]); + } }); return color; } @@ -47,7 +51,11 @@ static NSColor *color; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - color = UserPrefsColor(Pref_colorUnreadIndicator, [NSColor systemBlueColor]); + if (@available(macOS 10.14, *)) { + color = UserPrefsColor(Pref_colorStatusIconTint, [NSColor controlAccentColor]); + } else { + color = UserPrefsColor(Pref_colorStatusIconTint, [NSColor systemBlueColor]); + } }); return color; }