feat(wm): add cmd to resize by axis

This commit adds a new command to resize by axis. Resizing is still
limited to the BSP layout. This command is intended to be bound to mouse
wheel up and down events, with different modified keys determining the
axis to operate on.

komorebi-core/src/arrangement.rs

@@ -19,7 +19,7 @@ pub trait Arrangement {
         area: &Rect,
         len: NonZeroUsize,
         container_padding: Option<i32>,
-        layout_flip: Option<Flip>,
+        layout_flip: Option<Axis>,
         resize_dimensions: &[Option<Rect>],
     ) -> Vec<Rect>;
 }
@@ -31,7 +31,7 @@ impl Arrangement for DefaultLayout {
         area: &Rect,
         len: NonZeroUsize,
         container_padding: Option<i32>,
-        layout_flip: Option<Flip>,
+        layout_flip: Option<Axis>,
         resize_dimensions: &[Option<Rect>],
     ) -> Vec<Rect> {
         let len = usize::from(len);
@@ -57,7 +57,7 @@ impl Arrangement for DefaultLayout {
                 let mut stack_left = area.left + primary_right;
 
                 match layout_flip {
-                    Some(Flip::Horizontal | Flip::HorizontalAndVertical) if len > 1 => {
+                    Some(Axis::Horizontal | Axis::HorizontalAndVertical) if len > 1 => {
                         main_left = main_left + area.right - primary_right;
                         stack_left = area.left;
                     }
@@ -99,7 +99,7 @@ impl Arrangement for DefaultLayout {
                 let mut stack_top = area.top + bottom;
 
                 match layout_flip {
-                    Some(Flip::Vertical | Flip::HorizontalAndVertical) if len > 1 => {
+                    Some(Axis::Vertical | Axis::HorizontalAndVertical) if len > 1 => {
                         main_top = main_top + area.bottom - bottom;
                         stack_top = area.top;
                     }
@@ -150,7 +150,7 @@ impl Arrangement for DefaultLayout {
                         let mut secondary = area.left;
 
                         match layout_flip {
-                            Some(Flip::Horizontal | Flip::HorizontalAndVertical) if len > 1 => {
+                            Some(Axis::Horizontal | Axis::HorizontalAndVertical) if len > 1 => {
                                 primary = area.left;
                                 secondary = area.left + primary_right;
                             }
@@ -165,7 +165,7 @@ impl Arrangement for DefaultLayout {
                         let mut stack = area.left + primary_right + secondary_right;
 
                         match layout_flip {
-                            Some(Flip::Horizontal | Flip::HorizontalAndVertical) if len > 1 => {
+                            Some(Axis::Horizontal | Axis::HorizontalAndVertical) if len > 1 => {
                                 secondary = area.left + primary_right + secondary_right;
                                 stack = area.left;
                             }
@@ -224,7 +224,7 @@ impl Arrangement for CustomLayout {
         area: &Rect,
         len: NonZeroUsize,
         container_padding: Option<i32>,
-        _layout_flip: Option<Flip>,
+        _layout_flip: Option<Axis>,
         _resize_dimensions: &[Option<Rect>],
     ) -> Vec<Rect> {
         let mut dimensions = vec![];
@@ -343,7 +343,7 @@ impl Arrangement for CustomLayout {
 
 #[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum)]
 #[strum(serialize_all = "snake_case")]
-pub enum Flip {
+pub enum Axis {
     Horizontal,
     Vertical,
     HorizontalAndVertical,
@@ -478,7 +478,7 @@ fn recursive_fibonacci(
     idx: usize,
     count: usize,
     area: &Rect,
-    layout_flip: Option<Flip>,
+    layout_flip: Option<Axis>,
     resize_adjustments: Vec<Option<Rect>>,
 ) -> Vec<Rect> {
     let mut a = *area;
@@ -502,21 +502,21 @@ fn recursive_fibonacci(
 
     if let Some(flip) = layout_flip {
         match flip {
-            Flip::Horizontal => {
+            Axis::Horizontal => {
                 main_x = resized.left + half_width + (half_width - half_resized_width);
                 alt_x = resized.left;
 
                 alt_y = resized.top + half_resized_height;
                 main_y = resized.top;
             }
-            Flip::Vertical => {
+            Axis::Vertical => {
                 main_y = resized.top + half_height + (half_height - half_resized_height);
                 alt_y = resized.top;
 
                 main_x = resized.left;
                 alt_x = resized.left + half_resized_width;
             }
-            Flip::HorizontalAndVertical => {
+            Axis::HorizontalAndVertical => {
                 main_x = resized.left + half_width + (half_width - half_resized_width);
                 alt_x = resized.left;
                 main_y = resized.top + half_height + (half_height - half_resized_height);

komorebi-core/src/lib.rs

@@ -12,7 +12,7 @@ use strum::Display;
 use strum::EnumString;
 
 pub use arrangement::Arrangement;
-pub use arrangement::Flip;
+pub use arrangement::Axis;
 pub use custom_layout::CustomLayout;
 pub use cycle_direction::CycleDirection;
 pub use default_layout::DefaultLayout;
@@ -39,7 +39,8 @@ pub enum SocketMessage {
     CycleFocusWindow(CycleDirection),
     CycleMoveWindow(CycleDirection),
     StackWindow(OperationDirection),
-    ResizeWindow(OperationDirection, Sizing),
+    ResizeWindowEdge(OperationDirection, Sizing),
+    ResizeWindowAxis(Axis, Sizing),
     UnstackWindow,
     CycleStack(CycleDirection),
     MoveContainerToMonitorNumber(usize),
@@ -57,7 +58,7 @@ pub enum SocketMessage {
     AdjustWorkspacePadding(Sizing, i32),
     ChangeLayout(DefaultLayout),
     ChangeLayoutCustom(PathBuf),
-    FlipLayout(Flip),
+    FlipLayout(Axis),
     // Monitor and Workspace Commands
     EnsureWorkspaces(usize, usize),
     NewWorkspace,

komorebi-core/src/operation_direction.rs

@@ -7,7 +7,7 @@ use strum::Display;
 use strum::EnumString;
 
 use crate::direction::Direction;
-use crate::Flip;
+use crate::Axis;
 
 #[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum)]
 #[strum(serialize_all = "snake_case")]
@@ -29,23 +29,23 @@ impl OperationDirection {
         }
     }
 
-    fn flip(self, layout_flip: Option<Flip>) -> Self {
+    fn flip(self, layout_flip: Option<Axis>) -> Self {
         layout_flip.map_or(self, |flip| match self {
             Self::Left => match flip {
-                Flip::Horizontal | Flip::HorizontalAndVertical => Self::Right,
-                Flip::Vertical => self,
+                Axis::Horizontal | Axis::HorizontalAndVertical => Self::Right,
+                Axis::Vertical => self,
             },
             Self::Right => match flip {
-                Flip::Horizontal | Flip::HorizontalAndVertical => Self::Left,
-                Flip::Vertical => self,
+                Axis::Horizontal | Axis::HorizontalAndVertical => Self::Left,
+                Axis::Vertical => self,
             },
             Self::Up => match flip {
-                Flip::Vertical | Flip::HorizontalAndVertical => Self::Down,
-                Flip::Horizontal => self,
+                Axis::Vertical | Axis::HorizontalAndVertical => Self::Down,
+                Axis::Horizontal => self,
             },
             Self::Down => match flip {
-                Flip::Vertical | Flip::HorizontalAndVertical => Self::Up,
-                Flip::Horizontal => self,
+                Axis::Vertical | Axis::HorizontalAndVertical => Self::Up,
+                Axis::Horizontal => self,
             },
         })
     }
@@ -54,7 +54,7 @@ impl OperationDirection {
     pub fn destination(
         self,
         layout: &dyn Direction,
-        layout_flip: Option<Flip>,
+        layout_flip: Option<Axis>,
         idx: usize,
         len: NonZeroUsize,
     ) -> Option<usize> {