fix: preference window tab icons adapt to dark mode (closes #498)

This commit is contained in:
Louis Pontoise authored and lwouis committed 2020-08-07 17:17:42 +09:00
1 parent 4b624d2fc5
commit 0c44c5035c
8 files changed
+15 -7

No files matched your search

+8
View File
@@ -147,3 +147,11 @@ extension NSViewController {
subview.centerXAnchor.constraint(equalTo: view.centerXAnchor).isActive = true
}
}
extension NSImage {
static func initTemplate(_ name: String) -> NSImage {
let image = NSImage(named: name)!
image.isTemplate = true
return image
}
}
@@ -4,7 +4,7 @@ import Preferences
class AboutTab: NSViewController, PreferencePane {
let preferencePaneIdentifier = PreferencePane.Identifier("About")
let preferencePaneTitle = NSLocalizedString("About", comment: "")
let toolbarItemIcon = NSImage(named: "about")!
let toolbarItemIcon = NSImage.initTemplate("about")
override func loadView() {
let appIcon = NSImageView(image: NSImage(named: "app-icon")!.resizedCopy(256, 256))
@@ -7,7 +7,7 @@ class AcknowledgmentsTab: NSViewController, PreferencePane {
static let maxTabHeight = CGFloat(450)
let preferencePaneIdentifier = PreferencePane.Identifier("Acknowledgments")
let preferencePaneTitle = NSLocalizedString("Acknowledgments", comment: "")
let toolbarItemIcon = NSImage(named: "acknowledgments")!
let toolbarItemIcon = NSImage.initTemplate("acknowledgments")
override func loadView() {
let textViews: [TextField] = ["Contributors", "Acknowledgments"].map {
@@ -4,7 +4,7 @@ import Preferences
class AppearanceTab: NSViewController, PreferencePane {
let preferencePaneIdentifier = PreferencePane.Identifier("Appearance")
let preferencePaneTitle = NSLocalizedString("Appearance", comment: "")
let toolbarItemIcon = NSImage(named: "appearance")!
let toolbarItemIcon = NSImage.initTemplate("appearance")
override func loadView() {
let grid = GridView([
@@ -5,7 +5,7 @@ import Preferences
class BlacklistsTab: NSViewController, PreferencePane {
let preferencePaneIdentifier = PreferencePane.Identifier("Blacklists")
let preferencePaneTitle = NSLocalizedString("Blacklists", comment: "")
let toolbarItemIcon = NSImage(named: "blacklists")!
let toolbarItemIcon = NSImage.initTemplate("blacklists")
override func loadView() {
let dontShowBlacklistLabel = NSTextField(labelWithString: NSLocalizedString("Don’t show windows from these apps", comment: ""))
@@ -5,7 +5,7 @@ import Preferences
class ControlsTab: NSViewController, PreferencePane {
let preferencePaneIdentifier = PreferencePane.Identifier("Controls")
let preferencePaneTitle = NSLocalizedString("Controls", comment: "")
let toolbarItemIcon = NSImage(named: "controls")!
let toolbarItemIcon = NSImage.initTemplate("controls")
static var nextWindowShortcut: NSControl!
static var nextWindowShortcut2: NSControl!
@@ -4,7 +4,7 @@ import Preferences
class GeneralTab: NSViewController, PreferencePane {
let preferencePaneIdentifier = PreferencePane.Identifier("General")
let preferencePaneTitle = NSLocalizedString("General", comment: "")
let toolbarItemIcon = NSImage(named: "general")!
let toolbarItemIcon = NSImage.initTemplate("general")
override func loadView() {
let startAtLogin = LabelAndControl.makeLabelWithCheckbox(NSLocalizedString("Start at login:", comment: ""), "startAtLogin", extraAction: startAtLoginCallback)
@@ -5,7 +5,7 @@ import Preferences
class PoliciesTab: NSViewController, PreferencePane {
let preferencePaneIdentifier = PreferencePane.Identifier("Policies")
let preferencePaneTitle = NSLocalizedString("Policies", comment: "")
let toolbarItemIcon = NSImage(named: "policies")!
let toolbarItemIcon = NSImage.initTemplate("policies")
static var updateButtons: [NSButton]!
static var crashButtons: [NSButton]!