simpler key mechanism

onekiloparsec · Jan 15, 2017 · 2172d36 · 2172d36
1 parent bdb78ca
commit 2172d36
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 24 deletions.
diff --git a/KPCJumpBarControl/JumpBarControl.swift b/KPCJumpBarControl/JumpBarControl.swift
@@ -218,22 +218,11 @@ open class JumpBarControl: NSControl, JumpBarSegmentControlDelegate {
 
     // MARK: - Activation
 
-    open func makeKey() {
-        self.isKey = true
-        for segmentControl in self.segmentControls() {
-            segmentControl.makeKey()
-        }
+    open func makeKey(_ flag: Bool) {
+        self.isKey = flag
+        self.segmentControls().forEach { $0.makeKey(flag) }
         self.setNeedsDisplay()
-    }
-
-    open func resignKey() {
-        self.isKey = false
-        for segmentControl in self.segmentControls() {
-            segmentControl.resignKey()
-        }
-        self.setNeedsDisplay()
-    }
-
+    }    
 
     // MARK: - Layout
 
@@ -307,7 +296,7 @@ open class JumpBarControl: NSControl, JumpBarSegmentControlDelegate {
             let segment = self.segmentControlAtLevel(position)!
             segment.isLastSegment = (position == self.selectedIndexPath!.count-1)
             segment.indexInPath = index
-            segment.makeKey()
+            segment.makeKey(true)
 
             let item = currentMenu!.item(at: index)
             segment.representedObject = item!.representedObject as? JumpBarItem

diff --git a/KPCJumpBarControl/JumpBarSegmentControl.swift b/KPCJumpBarControl/JumpBarSegmentControl.swift
@@ -78,16 +78,11 @@ class JumpBarSegmentControl : NSControl {
         return w
     }
 
-    func makeKey() {
-        self.isKey = true
+    func makeKey(_ flag: Bool) {
+        self.isKey = flag
         self.setNeedsDisplay()
     }
-
-    func resignKey() {
-        self.isKey = false
-        self.setNeedsDisplay()
-    }
-
+
     // MARK: Delegate
 
     override func mouseDown(with theEvent: NSEvent) {