Refactors dimStartFromChange and dimFadeToChange

JohnCoates · Nov 18, 2018 · 54d1ae9 · 54d1ae9
1 parent e084ad5
commit 54d1ae9
Showing 1 changed file with 10 additions and 14 deletions.
diff --git a/Aerial/Source/Controllers/PreferencesWindowController.swift b/Aerial/Source/Controllers/PreferencesWindowController.swift
@@ -1222,19 +1222,17 @@ final class PreferencesWindowController: NSWindowController, NSOutlineViewDataSo
     }
 
     @IBAction func dimStartFromChange(_ sender: NSSliderCell) {
-        let timeManagement = TimeManagement.sharedInstance
-        guard let event = NSApplication.shared.currentEvent else {
-            return
-        }
+        guard let event = NSApplication.shared.currentEvent else { return }
 
-        if event.type != .leftMouseUp && event.type != .leftMouseDown && event.type != .leftMouseDragged {
+        guard [.leftMouseUp, .leftMouseDown, .leftMouseDragged].contains(event.type) else {
             //warnLog("Unexepected event type \(event.type)")
             return
         }
 
+        let timeManagement = TimeManagement.sharedInstance
         if event.type == .leftMouseUp {
-            if savedBrightness != nil {
-                timeManagement.setBrightness(level: savedBrightness!)
+            if let brightness = savedBrightness {
+                timeManagement.setBrightness(level: brightness)
                 savedBrightness = nil
             }
             preferences.startDim = sender.doubleValue
@@ -1248,18 +1246,16 @@ final class PreferencesWindowController: NSWindowController, NSOutlineViewDataSo
     }
 
     @IBAction func dimFadeToChange(_ sender: NSSliderCell) {
-        let timeManagement = TimeManagement.sharedInstance
-        guard let event = NSApplication.shared.currentEvent else {
-            return
-        }
+        guard let event = NSApplication.shared.currentEvent else { return }
 
-        if event.type != .leftMouseUp && event.type != .leftMouseDown && event.type != .leftMouseDragged {
+        if ![.leftMouseUp, .leftMouseDown, .leftMouseDragged].contains(event.type) {
             //warnLog("Unexepected event type \(event.type)")
         }
 
+        let timeManagement = TimeManagement.sharedInstance
         if event.type == .leftMouseUp {
-            if savedBrightness != nil {
-                timeManagement.setBrightness(level: savedBrightness!)
+            if let brightness = savedBrightness {
+                timeManagement.setBrightness(level: brightness)
                 savedBrightness = nil
             }
             preferences.endDim = sender.doubleValue