From 0d2583948ac54894f8f0626e4ce0b8bededb917d Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Tue, 12 Nov 2019 13:05:52 -0600 Subject: [PATCH] Add additional assets for Article Extractor Button for when the app is inactive. --- Mac/AppAssets.swift | 8 ++++++++ Mac/MainWindow/ArticleExtractorButton.swift | 10 +++++++++- .../ArticleExtractorInactiveDark.pdf | Bin 0 -> 3911 bytes .../Contents.json | 12 ++++++++++++ .../ArticleExtractorInactiveLight.pdf | Bin 0 -> 3911 bytes .../Contents.json | 12 ++++++++++++ 6 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 Mac/Resources/Assets.xcassets/articleExtractorInactiveDark.imageset/ArticleExtractorInactiveDark.pdf create mode 100644 Mac/Resources/Assets.xcassets/articleExtractorInactiveDark.imageset/Contents.json create mode 100644 Mac/Resources/Assets.xcassets/articleExtractorInactiveLight.imageset/ArticleExtractorInactiveLight.pdf create mode 100644 Mac/Resources/Assets.xcassets/articleExtractorInactiveLight.imageset/Contents.json diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift index ab5eb8dc6..ddab9827d 100644 --- a/Mac/AppAssets.swift +++ b/Mac/AppAssets.swift @@ -50,6 +50,14 @@ struct AppAssets { return RSImage(named: "articleExtractorError") }() + static var articleExtractorInactiveDark: RSImage! = { + return RSImage(named: "articleExtractorInactiveDark") + }() + + static var articleExtractorInactiveLight: RSImage! = { + return RSImage(named: "articleExtractorInactiveLight") + }() + static var articleExtractorProgress1: RSImage! = { return RSImage(named: "articleExtractorProgress1") }() diff --git a/Mac/MainWindow/ArticleExtractorButton.swift b/Mac/MainWindow/ArticleExtractorButton.swift index 69e250ed5..67b9f75da 100644 --- a/Mac/MainWindow/ArticleExtractorButton.swift +++ b/Mac/MainWindow/ArticleExtractorButton.swift @@ -59,7 +59,15 @@ class ArticleExtractorButton: NSButton { case isInProgress: addAnimatedSublayer(to: hostedLayer) default: - addImageSublayer(to: hostedLayer, image: AppAssets.articleExtractor, opacity: opacity) + if NSApplication.shared.isActive { + addImageSublayer(to: hostedLayer, image: AppAssets.articleExtractor, opacity: opacity) + } else { + if NSApplication.shared.effectiveAppearance.isDarkMode { + addImageSublayer(to: hostedLayer, image: AppAssets.articleExtractorInactiveDark, opacity: opacity) + } else { + addImageSublayer(to: hostedLayer, image: AppAssets.articleExtractorInactiveLight, opacity: opacity) + } + } } } diff --git a/Mac/Resources/Assets.xcassets/articleExtractorInactiveDark.imageset/ArticleExtractorInactiveDark.pdf b/Mac/Resources/Assets.xcassets/articleExtractorInactiveDark.imageset/ArticleExtractorInactiveDark.pdf new file mode 100644 index 0000000000000000000000000000000000000000..28edebd24c5931a9792c2a4911fa836f56325880 GIT binary patch literal 3911 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