From c7c5311ff94c8b4ca6991ba19f4c76d4ef8c0863 Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Fri, 17 Feb 2023 17:19:56 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Ensure=20checkbox=20shows=20corr?= =?UTF-8?q?ect=20initial=20state?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- phpmon/Domain/Preferences/PrefsVC.swift | 2 +- .../Preferences/Views/CheckboxPreferenceView.swift | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/phpmon/Domain/Preferences/PrefsVC.swift b/phpmon/Domain/Preferences/PrefsVC.swift index 87594c7..8091174 100644 --- a/phpmon/Domain/Preferences/PrefsVC.swift +++ b/phpmon/Domain/Preferences/PrefsVC.swift @@ -231,7 +231,7 @@ class GeneralPreferencesVC: GenericPreferenceVC { // MARK: - Lifecycle public static func fromStoryboard() -> GenericPreferenceVC { - var vc = NSStoryboard(name: "Main", bundle: nil) + let vc = NSStoryboard(name: "Main", bundle: nil) .instantiateController(withIdentifier: "preferencesTemplateVC") as! GenericPreferenceVC vc.views = [ diff --git a/phpmon/Domain/Preferences/Views/CheckboxPreferenceView.swift b/phpmon/Domain/Preferences/Views/CheckboxPreferenceView.swift index eee6b21..a5e8f3e 100644 --- a/phpmon/Domain/Preferences/Views/CheckboxPreferenceView.swift +++ b/phpmon/Domain/Preferences/Views/CheckboxPreferenceView.swift @@ -59,15 +59,12 @@ protocol CheckboxPreferenceViewBehavior { class CheckboxPreferenceBehavior: CheckboxPreferenceViewBehavior { var button: NSButton - var preference: PreferenceName { - didSet { - button.state = Preferences.isEnabled(self.preference) ? .on : .off - } - } + var preference: PreferenceName init(button: NSButton, preference: PreferenceName) { - self.button = button self.preference = preference + self.button = button + self.button.state = Preferences.isEnabled(self.preference) ? .on : .off } public func toggled(checked: Bool) {