staticプロパティをインスタンスプロパティに変更

[kcd/KCD.git] / KCD / DefaultKeys.swift

diff --git a/KCD/DefaultKeys.swift b/KCD/DefaultKeys.swift
index 5c680dc..7c7364a 100644 (file)
--- a/KCD/DefaultKeys.swift
+++ b/KCD/DefaultKeys.swift
@@ -46,7 +46,7 @@ import AppKit.NSColor
 import AppKit.NSControl
 
 
-func rangeReguletor<T: Comparable>(_ range: ClosedRange<T>) -> (T) -> T {
+func rangeReguletor<T>(_ range: ClosedRange<T>) -> (T) -> T {
     
     return {
         
@@ -54,9 +54,13 @@ func rangeReguletor<T: Comparable>(_ range: ClosedRange<T>) -> (T) -> T {
         let max = range.upperBound
         
         switch $0 {
+            
         case let v where v < min: return min
+            
         case let v where v > max: return max
+            
         default: return $0
+            
         }
     }
 }
@@ -123,7 +127,7 @@ extension DefaultKeys {
     static let screenshotPreviewZoomValue = DefaultKey<Double>("screenshotPreviewZoomValue", regulator: rangeReguletor(0.2...0.99))
     static let screenshotEditorColumnCount = DefaultKey<Int>("screenshotEditorColumnCount", regulator: rangeReguletor(1...50))
     static let scrennshotEditorType = DefaultKey<Int>("scrennshotEditorType")
-    static let screenshotButtonSize = DefaultKey<NSControlSize>("screenshotButtonSize", alternative: .regular)
+    static let screenshotButtonSize = DefaultKey<NSControl.ControlSize>("screenshotButtonSize", alternative: .regular)
     static let useMask = DefaultKey<Bool>("useMask")
     static let screenShotBorderWidth = DefaultKey<CGFloat>("screenShotBorderWidth", regulator: rangeReguletor(0.0...20.0))
     static let screenShotSaveDirectory = DefaultKey<String?>("screenShotSaveDirectory")