refactor: factorize code in extension

lwouis · Mar 10, 2020 · 0762e28 · 0762e28
1 parent 291f872
commit 0762e28
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/alt-tab-macos/api-wrappers/HelperExtensions.swift b/alt-tab-macos/api-wrappers/HelperExtensions.swift
@@ -85,3 +85,11 @@ extension Array where Element == Window {
         return self[index]
     }
 }
+
+extension NSView {
+    // constrain size to fittingSize
+    func fit() {
+        widthAnchor.constraint(equalToConstant: fittingSize.width).isActive = true
+        heightAnchor.constraint(equalToConstant: fittingSize.height).isActive = true
+    }
+}
diff --git a/alt-tab-macos/ui/PreferencesWindow.swift b/alt-tab-macos/ui/PreferencesWindow.swift
@@ -111,7 +111,7 @@ class PreferencesWindow: NSWindow, NSWindowDelegate {
         gridView.column(at: gridView.numberOfColumns - 1).trailingPadding = padding
         gridView.row(at: 0).topPadding = padding
         gridView.row(at: gridView.numberOfRows - 1).bottomPadding = padding
-        gridView.widthAnchor.constraint(equalToConstant: gridView.fittingSize.width).isActive = true
+        gridView.fit()
         gridView.rowAlignment = .lastBaseline
         for i in 0..<gridView.numberOfRows {
             gridView.row(at: i).height = 20
@@ -167,8 +167,7 @@ class PreferencesWindow: NSWindow, NSWindowDelegate {
 
     private func makeLabel(_ labelText: String?, _ rawName: String) -> NSTextField {
         let label = NSTextField(wrappingLabelWithString: labelText != nil ? labelText! + ": " : "")
-        label.widthAnchor.constraint(equalToConstant: label.fittingSize.width).isActive = true
-        label.heightAnchor.constraint(equalToConstant: label.fittingSize.height).isActive = true
+        label.fit()
         label.alignment = .right
         label.identifier = NSUserInterfaceItemIdentifier(rawName + ControlIdentifierDiscriminator.LABEL.rawValue)
         return label
@@ -183,8 +182,7 @@ class PreferencesWindow: NSWindow, NSWindowDelegate {
         }
         suffix.textColor = .gray
         suffix.identifier = NSUserInterfaceItemIdentifier(controlName + ControlIdentifierDiscriminator.SUFFIX.rawValue)
-        suffix.widthAnchor.constraint(equalToConstant: suffix.fittingSize.width).isActive = true
-        suffix.heightAnchor.constraint(equalToConstant: suffix.fittingSize.height).isActive = true
+        suffix.fit()
         return suffix
     }