Allow auto maximize to be disabled

rxhanson · Oct 16, 2021 · fb6835a · fb6835a
1 parent 2670991
commit fb6835a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Rectangle/Defaults.swift b/Rectangle/Defaults.swift
@@ -60,6 +60,7 @@ class Defaults {
     static let specifiedWidth = FloatDefault(key: "specifiedWidth", defaultValue: 1680)
     static let moveCursorAcrossDisplays = OptionalBoolDefault(key: "moveCursorAcrossDisplays")
     static let moveCursor = OptionalBoolDefault(key: "moveCursor")
+    static let autoMaximize = OptionalBoolDefault(key: "autoMaximize")
 
     static var array: [Default] = [
         launchOnLogin,

diff --git a/Rectangle/WindowCalculation/NextPrevDisplayCalculation.swift b/Rectangle/WindowCalculation/NextPrevDisplayCalculation.swift
@@ -52,7 +52,7 @@ class NextPrevDisplayCalculation: WindowCalculation {
     }
 
     override func calculateRect(_ params: RectCalculationParameters) -> RectResult {
-        if params.lastAction?.action == .maximize {
+        if params.lastAction?.action == .maximize && !Defaults.autoMaximize.userDisabled {
             let rectResult = WindowCalculationFactory.maximizeCalculation.calculateRect(params)
             return RectResult(rectResult.rect, resultingAction: .maximize)
         }