fix: hovering thumbnails would make alttab laggy (#1567)

lwouis · May 12, 2022 · 7e66009 · 7e66009
1 parent 296ced8
commit 7e66009
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/ui/generic-components/TrafficLightButton.swift b/src/ui/generic-components/TrafficLightButton.swift
@@ -12,6 +12,7 @@ class TrafficLightButton: NSButton {
         target = self
         action = #selector(onClick)
         fit(size, size)
+        addTrackingArea(NSTrackingArea(rect: bounds, options: [.mouseEnteredAndExited, .activeInKeyWindow], owner: self, userInfo: nil))
     }
 
     required init?(coder: NSCoder) {
@@ -28,10 +29,6 @@ class TrafficLightButton: NSButton {
         }
     }
 
-    override func updateTrackingAreas() {
-        addTrackingArea(NSTrackingArea(rect: bounds, options: [.activeInActiveApp, .mouseEnteredAndExited, .assumeInside, .inVisibleRect], owner: self, userInfo: nil))
-    }
-
     override func mouseEntered(with event: NSEvent) {
         isMouseOver = true
         setNeedsDisplay()
@@ -90,6 +87,7 @@ class TrafficLightButton: NSButton {
     }
 
     private func drawDimming(_ disk: NSBezierPath) {
+        disk.lineWidth = 1
         if (isHighlighted) {
             NSColor(calibratedRed: 0, green: 0, blue: 0, alpha: 0.5).setFill()
             disk.fill()
@@ -102,7 +100,7 @@ class TrafficLightButton: NSButton {
     private func drawDisk(_ backgroundGradient: NSGradient, _ strokeColor: NSColor) -> NSBezierPath {
         var disk = NSBezierPath()
         disk.appendOval(in: NSMakeRect(bounds.origin.x + 0.5, bounds.origin.y + 0.5, bounds.width - 1, bounds.height - 1))
-        backgroundGradient.draw(in: disk, relativeCenterPosition: NSMakePoint(0, 0))
+        backgroundGradient.draw(in: disk, relativeCenterPosition: .zero)
         strokeColor.setStroke()
         disk.lineWidth = 0.5
         disk.stroke()

diff --git a/src/ui/main-window/ThumbnailView.swift b/src/ui/main-window/ThumbnailView.swift
@@ -68,7 +68,6 @@ class ThumbnailView: NSStackView {
     }
 
     func showOrHideWindowControls(_ shouldShowWindowControls: Bool) {
-        self.shouldShowWindowControls = shouldShowWindowControls
         let shouldShow = shouldShowWindowControls && !Preferences.hideColoredCircles && !(window_?.isWindowlessApp ?? true) && !Preferences.hideThumbnails
         if isShowingWindowControls != shouldShow {
             isShowingWindowControls = shouldShow