Merge pull request #17 from dado3212/Auto-highlight

v1.4.1 - Add in listener for enter key

SpacesRenamer/AppDelegate.swift

@@ -148,6 +148,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             hiddenPopover.close()
 
             nameChangeWindow.makeKeyAndOrderFront(nil)
+            nameChangeWindow.selectCurrent()
             NSApp.activate(ignoringOtherApps: true)
         }
     }

SpacesRenamer/DesktopSnippet.swift

@@ -13,6 +13,7 @@ class DesktopSnippet: NSView {
     @IBOutlet var label: NSTextField!
     @IBOutlet var textField: NSTextField!
     @IBOutlet var monitorImage: NSImageView!
+    var isCurrent: Bool = false
 
     class func instanceFromNib() -> DesktopSnippet {
         var topLevelObjects : NSArray?

SpacesRenamer/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.0</string>
+	<string>1.4.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSMinimumSystemVersion</key>

SpacesRenamer/NameChangeWindow.swift

@@ -41,6 +41,14 @@ class NameChangeWindow: NSWindow {
         super.keyDown(with: event)
     }
 
+    func selectCurrent() {
+        DispatchQueue.main.async {
+            if let viewController = self.contentViewController as? ViewController {
+                viewController.selectCurrent()
+            }
+        }
+    }
+
     func refresh() {
         DispatchQueue.main.async {
             if let appDelegate = NSApplication.shared.delegate as? AppDelegate, let button = appDelegate.statusItem.button {

SpacesRenamer/ViewController.swift

@@ -80,7 +80,8 @@ class ViewController: NSViewController {
 
                 let snippet = DesktopSnippet.instanceFromNib()
                 if (uuid == currentSpace) {
-                    snippet.monitorImage.image = NSImage(named: NSImage.Name("MonitorSelected") )
+                    snippet.monitorImage.image = NSImage(named: NSImage.Name("MonitorSelected"))
+                    snippet.isCurrent = true
                 }
 
                 snippet.label.stringValue = "\(i)"
@@ -141,6 +142,17 @@ class ViewController: NSViewController {
                 textField.stringValue = newName as! String
             }
         }
+
+        selectCurrent()
+    }
+
+    func selectCurrent() {
+        for snippet in snippets {
+            if snippet.isCurrent {
+                snippet.textField.becomeFirstResponder()
+                break
+            }
+        }
     }
 
     override func viewWillAppear() {
@@ -180,6 +192,14 @@ extension ViewController: NSTextFieldDelegate {
             appDelegate.closeNameChangeWindow(sender: nil)
         }
     }
+
+    func control(_ control: NSControl, textView: NSTextView, doCommandBy commandSelector: Selector) -> Bool {
+        if commandSelector == #selector(NSResponder.insertNewline(_:)) {
+            self.pressChangeName(textView)
+            return true
+        }
+        return false
+    }
 }
 
 extension ViewController {