Merge pull request #251 from wakatime/bugfix/fix-settings-dynamic

Fix showing and hiding browser settings
wakatime · Mar 27, 2024 · fdf2747 · fdf2747
2 parents 3ec4aa2 + 18a8045
commit fdf2747
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 40 deletions.
diff --git a/WakaTime/AppDelegate.swift b/WakaTime/AppDelegate.swift
@@ -153,6 +153,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, StatusBarDelegate {
 
     private func showSettings() {
         NSApp.activate(ignoringOtherApps: true)
+        settingsWindowController.settingsView.setBrowserVisibility()
         settingsWindowController.showWindow(self)
     }
 

diff --git a/WakaTime/Views/SettingsView.swift b/WakaTime/Views/SettingsView.swift
@@ -167,40 +167,32 @@ class SettingsView: NSView, NSTextFieldDelegate, NSTextViewDelegate {
     }()
 
     lazy var stackView: NSStackView = {
-        var views: [NSView] = [
+        let stackView = NSStackView(views: [
             apiKeyStackView,
-            checkboxesStackView
-        ]
-        if MonitoringManager.isMonitoringBrowsing {
-            views.append(contentsOf: [
-                browserLabel,
-                domainStackView,
-                filterStackView,
-                versionLabel
-            ])
-        }
-
-        let stackView = NSStackView(views: views)
+            checkboxesStackView,
+            browserLabel,
+            domainStackView,
+            filterStackView,
+            versionLabel
+        ])
         stackView.alignment = .leading
         stackView.orientation = .vertical
         stackView.spacing = 25
         stackView.distribution = .equalSpacing
         stackView.edgeInsets = NSEdgeInsets(top: 10, left: 10, bottom: 10, right: 10)
         stackView.translatesAutoresizingMaskIntoConstraints = false
 
-        if MonitoringManager.isMonitoringBrowsing {
-            stackView.addConstraint(
-                NSLayoutConstraint(
-                    item: filterStackView,
-                    attribute: .width,
-                    relatedBy: .equal,
-                    toItem: stackView,
-                    attribute: .width,
-                    multiplier: 1,
-                    constant: -(stackView.edgeInsets.left + stackView.edgeInsets.right)
-                )
+        stackView.addConstraint(
+            NSLayoutConstraint(
+                item: filterStackView,
+                attribute: .width,
+                relatedBy: .equal,
+                toItem: stackView,
+                attribute: .width,
+                multiplier: 1,
+                constant: -(stackView.edgeInsets.left + stackView.edgeInsets.right)
             )
-        }
+        )
 
         return stackView
     }()
@@ -212,11 +204,9 @@ class SettingsView: NSView, NSTextFieldDelegate, NSTextViewDelegate {
 
         addSubview(stackView)
         setupConstraints()
-
-        if MonitoringManager.isMonitoringBrowsing {
-            updateDomainPreference(animate: false)
-            updateFilterControls(animate: false)
-        }
+        setBrowserVisibility()
+        updateDomainPreference(animate: false)
+        updateFilterControls(animate: false)
     }
 
     required init?(coder: NSCoder) {
@@ -282,6 +272,21 @@ class SettingsView: NSView, NSTextFieldDelegate, NSTextViewDelegate {
         ])
     }
 
+    func setBrowserVisibility() {
+        if MonitoringManager.isMonitoringBrowsing {
+            browserLabel.isHidden = false
+            domainStackView.isHidden = false
+            filterStackView.isHidden = false
+            versionLabel.isHidden = false
+        } else {
+            browserLabel.isHidden = true
+            domainStackView.isHidden = true
+            filterStackView.isHidden = true
+            versionLabel.isHidden = true
+        }
+        adjustWindowSize(animate: false)
+    }
+
     // MARK: State Helpers
 
     private func updateDomainPreference(animate: Bool) {

diff --git a/WakaTime/Watchers/MonitoredApp.swift b/WakaTime/Watchers/MonitoredApp.swift
@@ -206,6 +206,17 @@ enum MonitoredApp: String, CaseIterable {
         }
 
         switch self {
+            case .canva:
+                // Canva obviously implements tabs in a different way than the tab content UI.
+                // Due to this circumstance, it's possible to just sample an element from the
+                // Canva window which is positioned underneath the tab bar and trace to the
+                // web area root which appears to be properly titled. All the UI zoom settings
+                // in Canva only change the tab content or sub content of the tab content, hence
+                // this should be relatively safe. In cases where this fails, nil should be
+                // returned as a consequence of the web area not being found.
+                let someElem = element.elementAtPositionRelativeToWindow(x: 10, y: 60)
+                let webArea = someElem?.firstAncestorWhere { $0.role == "AXWebArea" }
+                return webArea?.rawTitle
             case .notes:
                 // There's apparently two text editor implementations in Apple Notes. One uses a web view,
                 // the other appears to be a native implementation based on the `ICTK2MacTextView` class.
@@ -235,16 +246,7 @@ enum MonitoredApp: String, CaseIterable {
             case .brave:
                 fatalError("\(self.rawValue) should never use window title as entity")
             case .canva:
-                // Canva obviously implements tabs in a different way than the tab content UI.
-                // Due to this circumstance, it's possible to just sample an element from the
-                // Canva window which is positioned underneath the tab bar and trace to the
-                // web area root which appears to be properly titled. All the UI zoom settings
-                // in Canva only change the tab content or sub content of the tab content, hence
-                // this should be relatively safe. In cases where this fails, nil should be
-                // returned as a consequence of the web area not being found.
-                let someElem = element.elementAtPositionRelativeToWindow(x: 10, y: 60)
-                let webArea = someElem?.firstAncestorWhere { $0.role == "AXWebArea" }
-                return webArea?.rawTitle
+                fatalError("\(self.rawValue) should never use window title as entity")
             case .chrome:
                 fatalError("\(self.rawValue) should never use window title as entity")
             case .figma: