Fix edit view tabbing (#141)

Gifski/EditVideoViewController.swift

@@ -94,16 +94,10 @@ final class EditVideoViewController: NSViewController {
 	override func viewDidAppear() {
 		super.viewDidAppear()
 
-		view.window?.makeFirstResponder(self)
-
-		dimensionsTypeDropdown.nextKeyView = frameRateSlider
-		widthTextField.nextKeyView = heightTextField
-		heightTextField.nextKeyView = dimensionsTypeDropdown
-		qualitySlider.nextKeyView = loopCheckbox
-		loopCheckbox.nextKeyView = cancelButton
+		view.window?.makeFirstResponder(playerViewController.playerView)
+		setUpTabOrder()
 
 		tooltip.show(from: widthTextField, preferredEdge: .maxX)
-		predefinedSizesDropdown.focus()
 	}
 
 	private func setUpDimensions() {
@@ -303,6 +297,20 @@ final class EditVideoViewController: NSViewController {
 		add(childController: playerViewController, to: playerViewWrapper)
 	}
 
+	private func setUpTabOrder() {
+		if let button = view.window?.firstResponder as? NSButton {
+			button.nextKeyView = predefinedSizesDropdown
+		}
+
+		predefinedSizesDropdown.nextKeyView = widthTextField
+		widthTextField.nextKeyView = heightTextField
+		heightTextField.nextKeyView = dimensionsTypeDropdown
+		dimensionsTypeDropdown.nextKeyView = frameRateSlider
+		frameRateSlider.nextKeyView = qualitySlider
+		qualitySlider.nextKeyView = loopCheckbox
+		loopCheckbox.nextKeyView = cancelButton
+	}
+
 	private func updateTextFieldsMinMax() {
 		let widthMinMax = resizableDimensions.widthMinMax
 		let heightMinMax = resizableDimensions.heightMinMax

Gifski/MenuPopUpButton.swift

@@ -2,6 +2,7 @@ import AppKit
 
 final class MenuPopUpButton: NSPopUpButton, NSMenuDelegate {
 	override var acceptsFirstResponder: Bool { true }
+	override var canBecomeKeyView: Bool { true }
 
 	/// `selectedIndex` is nil when the user didn't select any index this time (probably quit).
 	var onMenuDidClose: ((_ selectedIndex: Int?) -> Void)?

Gifski/TrimmingAVPlayerViewController.swift

@@ -137,4 +137,7 @@ final class TrimmingAVPlayerView: AVPlayerView {
 		let overlayView = CheckerboardView(frame: frame, clearRect: videoBounds)
 		contentOverlayView?.addSubview(overlayView)
 	}
+
+	/// Prevent user from dismissing trimming view
+	override func cancelOperation(_ sender: Any?) { }
 }