Add a button for hard resetting layouts (#1767)

Author: ianyh

Amethyst/AppDelegate.swift

@@ -132,6 +132,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         windowManager?.markAllScreensForReflow(withChange: .unknown)
     }
 
+    @IBAction func resetLayouts(_ sender: AnyObject) {
+        UserDefaults.standard.removeObject(forKey: AppDelegate.windowManagerEncodingKey)
+        windowManager?.reset()
+    }
+
     @IBAction func relaunch(_ sender: AnyObject) {
         AppManager.relaunch()
     }

Amethyst/Base.lproj/MainMenu.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23727" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23727"/>
         <capability name="Image references" minToolsVersion="12.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -45,10 +45,16 @@
                         <action selector="checkForUpdates:" target="494" id="l9Y-Ct-Bzq"/>
                     </connections>
                 </menuItem>
-                <menuItem title="Relaunch Amethyst" id="8DH-wG-R1x">
+                <menuItem title="Reset Layouts" id="8DH-wG-R1x">
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <connections>
-                        <action selector="relaunch:" target="494" id="SdJ-ap-5Vy"/>
+                        <action selector="resetLayouts:" target="494" id="Osy-WG-Dy8"/>
+                    </connections>
+                </menuItem>
+                <menuItem title="Relaunch Amethyst" id="crd-PN-Vy2">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="relaunch:" target="494" id="EeN-oj-Mtv"/>
                     </connections>
                 </menuItem>
                 <menuItem isSeparatorItem="YES" id="553"/>

Amethyst/Managers/WindowManager.swift

@@ -48,7 +48,7 @@ final class WindowManager<Application: ApplicationType>: NSObject, Codable {
 
     private var applications: [pid_t: AnyApplication<Application>] = [:]
     private var applicationObservations: [pid_t: UndeterminedApplication] = [:]
-    private let screens: Screens
+    private var screens: Screens
     private let windows = Windows()
     private var lastReflowTime = Date()
     private var lastFocusDate: Date?
@@ -103,6 +103,12 @@ final class WindowManager<Application: ApplicationType>: NSObject, Codable {
         NotificationCenter.default.removeObserver(self)
     }
 
+    func reset() {
+        screens = Screens()
+        reevaluateWindows()
+        screens.updateScreens(windowManager: self)
+    }
+
     private func addWorkspaceNotificationObserver(_ name: NSNotification.Name, selector: Selector) {
         let workspaceNotificationCenter = NSWorkspace.shared.notificationCenter
         workspaceNotificationCenter.addObserver(self, selector: selector, name: name, object: nil)