fix: Menu-bar widget guards, bypass setNeedsDisplayInRect

Kit/Widgets/BarChart.swift

@@ -83,7 +83,7 @@ public class BarChart: WidgetWrapper {
             }
             self.setFrameSize(NSSize(width: 36, height: self.frame.size.height))
             self.invalidateIntrinsicContentSize()
-            self.display()
+            self.renderToLayer()
         }
 
         let style = NSMutableParagraphStyle()

Kit/Widgets/Battery.swift

@@ -407,18 +407,17 @@ public class BatteryWidget: WidgetWrapper {
         }
 
         if updated {
-            self.needsDisplay = true
             DispatchQueue.main.async(execute: {
-                self.display()
+                self.renderToLayer()
             })
         }
     }
-    
+
     // MARK: - Settings
-    
+
     public override func settings() -> NSView {
         let view = SettingsContainerView()
-        
+
         var additionalOptions = BatteryAdditionals
         if self.title == "Bluetooth" {
             additionalOptions = additionalOptions.filter({ $0.key == "none" || $0.key == "percentage" })
@@ -455,31 +454,31 @@ public class BatteryWidget: WidgetWrapper {
         guard let key = sender.representedObject as? String else { return }
         self.additional = key
         Store.shared.set(key: "\(self.title)_\(self.type.rawValue)_additional", value: key)
-        self.display()
+        self.renderToLayer()
     }
 
     @objc private func toggleHideAdditionalWhenFull(_ sender: NSControl) {
         self.hideAdditionalWhenFull = controlState(sender)
         Store.shared.set(key: "\(self.title)_\(self.type.rawValue)_hideAdditionalWhenFull", value: self.hideAdditionalWhenFull)
-        self.display()
+        self.renderToLayer()
     }
 
     @objc private func toggleColor(_ sender: NSControl) {
         self.colorState = controlState(sender)
         Store.shared.set(key: "\(self.title)_\(self.type.rawValue)_color", value: self.colorState)
-        self.display()
+        self.renderToLayer()
     }
 
     @objc private func toggleXLSize(_ sender: NSControl) {
         self.xlSizeState = controlState(sender)
         Store.shared.set(key: "\(self.title)_\(self.type.rawValue)_xlSize", value: self.xlSizeState)
-        self.display()
+        self.renderToLayer()
     }
 
     @objc private func toggleChargerIconInside(_ sender: NSControl) {
         self.chargerIconInside = controlState(sender)
         Store.shared.set(key: "\(self.title)_\(self.type.rawValue)_chargerInside", value: self.chargerIconInside)
-        self.display()
+        self.renderToLayer()
     }
 }
 
@@ -624,15 +623,15 @@ public class BatteryDetailsWidget: WidgetWrapper {
         }
 
         if updated {
-            self.needsDisplay = true
             DispatchQueue.main.async(execute: {
-                self.display()
+                self.renderToLayer()
             })
         }
     }
-    
+
     // MARK: - Settings
-
+
+
     public override func settings() -> NSView {
         let view = SettingsContainerView()
 
@@ -651,6 +650,6 @@ public class BatteryDetailsWidget: WidgetWrapper {
         guard let key = sender.representedObject as? String else { return }
         self.mode = key
         Store.shared.set(key: "\(self.title)_\(self.type.rawValue)_mode", value: key)
-        self.display()
+        self.renderToLayer()
     }
 }

Kit/Widgets/Dot.swift

@@ -54,7 +54,7 @@ public class DotWidget: WidgetWrapper {
         guard self.value != value else { return }
         self.value = value
         DispatchQueue.main.async(execute: {
-            self.display()
+            self.renderToLayer()
         })
     }
 }

Kit/Widgets/LineChart.swift

@@ -233,7 +233,9 @@ public class LineChart: WidgetWrapper {
             height: box.bounds.height - offset
         )
         self.chart.setColor(color)
-        self.chart.setFrameSize(chartSize)
+        if self.chart.frame.size != chartSize {
+            self.chart.setFrameSize(chartSize)
+        }
         self.chart.draw(NSRect(origin: .zero, size: chartSize))
 
         context.restoreGState()
@@ -251,15 +253,15 @@ public class LineChart: WidgetWrapper {
         DispatchQueue.main.async(execute: {
             self._value = newValue
             self.chart.addValue(newValue)
-            self.display()
+            self.renderToLayer()
         })
     }
-    
+
     public func setPressure(_ newPressureLevel: RAMPressure) {
         DispatchQueue.main.async(execute: {
             guard self._pressureLevel != newPressureLevel else { return }
             self._pressureLevel = newPressureLevel
-            self.display()
+            self.renderToLayer()
         })
     }
 
@@ -317,7 +319,7 @@ public class LineChart: WidgetWrapper {
     @objc private func toggleLabel(_ sender: NSControl) {
         self.labelState = controlState(sender)
         Store.shared.set(key: "\(self.title)_\(self.type.rawValue)_label", value: self.labelState)
-        self.display()
+        self.renderToLayer()
     }
 
     @objc private func toggleBox(_ sender: NSControl) {
@@ -330,7 +332,7 @@ public class LineChart: WidgetWrapper {
             Store.shared.set(key: "\(self.title)_\(self.type.rawValue)_frame", value: self.frameState)
         }
 
-        self.display()
+        self.renderToLayer()
     }
 
     @objc private func toggleFrame(_ sender: NSControl) {
@@ -343,34 +345,34 @@ public class LineChart: WidgetWrapper {
             Store.shared.set(key: "\(self.title)_\(self.type.rawValue)_box", value: self.boxState)
         }
 
-        self.display()
+        self.renderToLayer()
     }
 
     @objc private func toggleValue(_ sender: NSControl) {
         self.valueState = controlState(sender)
         Store.shared.set(key: "\(self.title)_\(self.type.rawValue)_value", value: self.valueState)
-        self.display()
+        self.renderToLayer()
     }
 
     @objc private func toggleColor(_ sender: NSMenuItem) {
         guard let key = sender.representedObject as? String else { return }
         self.colorState = SColor.fromString(key, defaultValue: self.colorState)
         Store.shared.set(key: "\(self.title)_\(self.type.rawValue)_color", value: self.colorState.key)
-        self.display()
+        self.renderToLayer()
     }
 
     @objc private func toggleValueColor(_ sender: NSControl) {
         self.valueColorState = controlState(sender)
         Store.shared.set(key: "\(self.title)_\(self.type.rawValue)_valueColor", value: self.valueColorState)
-        self.display()
+        self.renderToLayer()
     }
 
     @objc private func toggleHistoryCount(_ sender: NSMenuItem) {
         guard let key = sender.representedObject as? String, let value = Int(key) else { return }
         self.historyCount = value
         Store.shared.set(key: "\(self.title)_\(self.type.rawValue)_historyCount", value: value)
         self.chart.reinit(value)
-        self.display()
+        self.renderToLayer()
     }
 
     @objc private func toggleScale(_ sender: NSMenuItem) {
@@ -379,6 +381,6 @@ public class LineChart: WidgetWrapper {
         self.scaleState = value
         self.chart.setScale(value)
         Store.shared.set(key: "\(self.title)_\(self.type.rawValue)_scale", value: key)
-        self.display()
+        self.renderToLayer()
     }
 }

Kit/Widgets/Memory.swift

@@ -131,17 +131,17 @@ public class MemoryWidget: WidgetWrapper {
     public func setValue(_ value: (String, String), usedPercentage: Double) {
         self.value = value
         self.percentage = usedPercentage
-        
+
         DispatchQueue.main.async(execute: {
-            self.display()
+            self.renderToLayer()
         })
     }
-    
+
     public func setPressure(_ newPressureLevel: RAMPressure) {
         guard self.pressureLevel != newPressureLevel else { return }
         self.pressureLevel = newPressureLevel
         DispatchQueue.main.async(execute: {
-            self.display()
+            self.renderToLayer()
         })
     }
 
@@ -170,19 +170,19 @@ public class MemoryWidget: WidgetWrapper {
     @objc private func toggleOrder(_ sender: NSControl) {
         self.orderReversedState = controlState(sender)
         Store.shared.set(key: "\(self.title)_\(self.type.rawValue)_orderReversed", value: self.orderReversedState)
-        self.display()
+        self.renderToLayer()
     }
 
     @objc private func toggleSymbols(_ sender: NSControl) {
         self.symbolsState = controlState(sender)
         Store.shared.set(key: "\(self.title)_\(self.type.rawValue)_symbols", value: self.symbolsState)
-        self.display()
+        self.renderToLayer()
     }
 
     @objc private func toggleColor(_ sender: NSMenuItem) {
         guard let key = sender.representedObject as? String else { return }
         self.colorState = SColor.fromString(key, defaultValue: self.colorState)
         Store.shared.set(key: "\(self.title)_\(self.type.rawValue)_color", value: self.colorState.key)
-        self.display()
+        self.renderToLayer()
     }
 }

Kit/Widgets/Mini.swift

@@ -151,18 +151,18 @@ public class Mini: WidgetWrapper {
         guard self._value != newValue else { return }
         self._value = newValue
         DispatchQueue.main.async(execute: {
-            self.display()
+            self.renderToLayer()
         })
     }
 
     public func setPressure(_ newPressureLevel: RAMPressure) {
         guard self._pressureLevel != newPressureLevel else { return }
         self._pressureLevel = newPressureLevel
         DispatchQueue.main.async(execute: {
-            self.needsDisplay = true
+            self.renderToLayer()
         })
     }
-    
+
     public func setTitle(_ newTitle: String?) {
         var title = self.defaultLabel
         if let new = newTitle {
@@ -171,23 +171,23 @@ public class Mini: WidgetWrapper {
         guard self._label != title else { return }
         self._label = title
         DispatchQueue.main.async(execute: {
-            self.needsDisplay = true
+            self.renderToLayer()
         })
     }
-    
+
     public func setColorZones(_ newColorZones: colorZones) {
         guard self._colorZones != newColorZones else { return }
         self._colorZones = newColorZones
         DispatchQueue.main.async(execute: {
-            self.display()
+            self.renderToLayer()
         })
     }
-    
+
     public func setSuffix(_ newSuffix: String) {
         guard self._suffix != newSuffix else { return }
         self._suffix = newSuffix
         DispatchQueue.main.async(execute: {
-            self.display()
+            self.renderToLayer()
         })
     }
 
@@ -220,13 +220,13 @@ public class Mini: WidgetWrapper {
         guard let key = sender.representedObject as? String else { return }
         self.colorState = SColor.fromString(key, defaultValue: self.colorState)
         Store.shared.set(key: "\(self.title)_\(self.type.rawValue)_color", value: self.colorState.key)
-        self.display()
+        self.renderToLayer()
     }
 
     @objc private func toggleLabel(_ sender: NSControl) {
         self.labelState = controlState(sender)
         Store.shared.set(key: "\(self.title)_\(self.type.rawValue)_label", value: self.labelState)
-        self.display()
+        self.renderToLayer()
     }
 
     @objc private func toggleAlignment(_ sender: NSMenuItem) {
@@ -235,6 +235,6 @@ public class Mini: WidgetWrapper {
             self.alignmentState = newAlignment.key
         }
         Store.shared.set(key: "\(self.title)_\(self.type.rawValue)_alignment", value: key)
-        self.display()
+        self.renderToLayer()
     }
 }