feat: add smart-opposite resize option

#741 closes #742
nikitabobko · Nov 23, 2024 · bdf57d3 · bdf57d3
1 parent 61e427b
commit bdf57d3
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/Sources/AppBundle/command/impl/ResizeCommand.swift b/Sources/AppBundle/command/impl/ResizeCommand.swift
@@ -31,6 +31,12 @@ struct ResizeCommand: Command { // todo cover with tests
                 node = first
                 parent = first.parent as! TilingContainer
                 orientation = parent.orientation
+            case .smartOpposite:
+                guard let _orientation = (candidates.first?.parent as? TilingContainer)?.orientation.opposite else { return false }
+                orientation = _orientation
+                guard let first = candidates.first(where: { ($0.parent as! TilingContainer).orientation == orientation }) else { return false }
+                node = first
+                parent = first.parent as! TilingContainer
         }
         let diff: CGFloat = switch args.units.val {
             case .set(let unit): CGFloat(unit) - node.getWeight(orientation)

diff --git a/Sources/AppBundleTests/command/ResizeCommandTest.swift b/Sources/AppBundleTests/command/ResizeCommandTest.swift
@@ -10,12 +10,16 @@ final class ResizeCommandTest: XCTestCase {
         testParseCommandSucc("resize smart -10", ResizeCmdArgs(rawArgs: [], dimension: .smart, units: .subtract(10)))
         testParseCommandSucc("resize smart 10", ResizeCmdArgs(rawArgs: [], dimension: .smart, units: .set(10)))
 
+        testParseCommandSucc("resize smart-opposite +10", ResizeCmdArgs(rawArgs: [], dimension: .smartOpposite, units: .add(10)))
+        testParseCommandSucc("resize smart-opposite -10", ResizeCmdArgs(rawArgs: [], dimension: .smartOpposite, units: .subtract(10)))
+        testParseCommandSucc("resize smart-opposite 10", ResizeCmdArgs(rawArgs: [], dimension: .smartOpposite, units: .set(10)))
+
         testParseCommandSucc("resize height 10", ResizeCmdArgs(rawArgs: [], dimension: .height, units: .set(10)))
         testParseCommandSucc("resize width 10", ResizeCmdArgs(rawArgs: [], dimension: .width, units: .set(10)))
 
         testParseCommandFail("resize s 10", msg: """
             ERROR: Can't parse 's'.
-                   Possible values: (width|height|smart)
+                   Possible values: (width|height|smart|smart-opposite)
             """)
         testParseCommandFail("resize smart foo", msg: "ERROR: <number> argument must be a number")
     }

diff --git a/Sources/Common/cmdArgs/impl/ResizeCmdArgs.swift b/Sources/Common/cmdArgs/impl/ResizeCmdArgs.swift
@@ -9,7 +9,7 @@ public struct ResizeCmdArgs: CmdArgs {
             "--window-id": optionalWindowIdFlag(),
         ],
         arguments: [
-            newArgParser(\.dimension, parseDimension, mandatoryArgPlaceholder: "(smart|width|height)"),
+            newArgParser(\.dimension, parseDimension, mandatoryArgPlaceholder: "(smart|smart-opposite|width|height)"),
             newArgParser(\.units, parseUnits, mandatoryArgPlaceholder: "[+|-]<number>"),
         ]
     )
@@ -31,6 +31,7 @@ public struct ResizeCmdArgs: CmdArgs {
 
     public enum Dimension: String, CaseIterable, Equatable {
         case width, height, smart
+        case smartOpposite = "smart-opposite"
     }
 
     public enum Units: Equatable {

diff --git a/Sources/Common/cmdHelpGenerated.swift b/Sources/Common/cmdHelpGenerated.swift
@@ -115,7 +115,7 @@ let reload_config_help_generated = """
     USAGE: reload-config [-h|--help] [--no-gui] [--dry-run]
     """
 let resize_help_generated = """
-    USAGE: resize [-h|--help] [--window-id <window-id>] (smart|width|height) [+|-]<number>
+    USAGE: resize [-h|--help] [--window-id <window-id>] (smart|smart-opposite|width|height) [+|-]<number>
     """
 let split_help_generated = """
     USAGE: split [-h|--help] [--window-id <window-id>] (horizontal|vertical|opposite)

diff --git a/docs/aerospace-resize.adoc b/docs/aerospace-resize.adoc
@@ -9,7 +9,7 @@ include::util/man-attributes.adoc[]
 == Synopsis
 [verse]
 // tag::synopsis[]
-aerospace resize [-h|--help] [--window-id <window-id>] (smart|width|height) [+|-]<number>
+aerospace resize [-h|--help] [--window-id <window-id>] (smart|smart-opposite|width|height) [+|-]<number>
 
 // end::synopsis[]
 
@@ -25,6 +25,7 @@ The dimension to resize is chosen by the first argument
 * `height` changes height
 * `smart` changes width if the parent has horizontal orientation, and
 it changes height if the parent has vertical orientation
+* `smart-opposite` does resizes the opposite axis of smart
 
 Second argument controls how much the size is changes
 

diff --git a/grammar/commands-bnf-grammar.txt b/grammar/commands-bnf-grammar.txt
@@ -55,7 +55,7 @@ aerospace -h;
 
     | reload-config [--no-gui | --dry-run]...
 
-    | resize [--window-id <window_id>] (smart|width|height) [+|-]<number> [--window-id <window_id>]
+    | resize [--window-id <window_id>] (smart|smart-opposite|width|height) [+|-]<number> [--window-id <window_id>]
 
     | split [--window-id <window_id>] (horizontal|vertical|opposite) [--window-id <window_id>]