Fix: allow 0% coordinate specification for floating panes (#4609)

* fix: allow 0% when specifying x/y coordinates but not when specifying width/height

* rustfmt

* add pr

2 files changed, 47 insertions, 17 deletions

diff --git a/zellij-utils/src/plugin_api/action.rs b/zellij-utils/src/plugin_api/action.rs
index aa4c8b09..96074948 100644
--- a/zellij-utils/src/plugin_api/action.rs
+++ b/zellij-utils/src/plugin_api/action.rs
@@ -2212,6 +2212,32 @@ impl TryFrom<SplitSize> for ProtobufSplitSize {
     }
 }
 
+impl TryFrom<ProtobufSplitSize> for PercentOrFixed {
+    type Error = &'static str;
+    fn try_from(protobuf_split_size: ProtobufSplitSize) -> Result<Self, &'static str> {
+        use super::generated_api::api::action::split_size::SplitSizeVariant;
+
+        match protobuf_split_size.split_size_variant {
+            Some(SplitSizeVariant::Percent(p)) => Ok(PercentOrFixed::Percent(p as usize)),
+            Some(SplitSizeVariant::Fixed(f)) => Ok(PercentOrFixed::Fixed(f as usize)),
+            None => Err("PercentOrFixed must have either percent or fixed value"),
+        }
+    }
+}
+
+impl TryFrom<PercentOrFixed> for ProtobufSplitSize {
+    type Error = &'static str;
+    fn try_from(percent_or_fixed: PercentOrFixed) -> Result<Self, &'static str> {
+        use super::generated_api::api::action::split_size::SplitSizeVariant;
+
+        let split_size_variant = match percent_or_fixed {
+            PercentOrFixed::Percent(p) => Some(SplitSizeVariant::Percent(p as u32)),
+            PercentOrFixed::Fixed(f) => Some(SplitSizeVariant::Fixed(f as u32)),
+        };
+        Ok(ProtobufSplitSize { split_size_variant })
+    }
+}
+
 // FloatingPaneCoordinates conversions
 impl TryFrom<ProtobufFloatingPaneCoordinates> for FloatingPaneCoordinates {
     type Error = &'static str;
diff --git a/zellij-utils/src/plugin_api/plugin_command.rs b/zellij-utils/src/plugin_api/plugin_command.rs
index 8c4bf451..d26ab7ec 100644
--- a/zellij-utils/src/plugin_api/plugin_command.rs
+++ b/zellij-utils/src/plugin_api/plugin_command.rs
@@ -63,7 +63,7 @@ use crate::data::{
     SaveLayoutResponse,
 };
 use crate::input::actions::Action;
-use crate::input::layout::SplitSize;
+use crate::input::layout::PercentOrFixed;
 
 use std::collections::BTreeMap;
 use std::convert::TryFrom;
@@ -76,27 +76,31 @@ impl Into<FloatingPaneCoordinates> for ProtobufFloatingPaneCoordinates {
                 .x
                 .and_then(|x| match ProtobufFixedOrPercent::from_i32(x.r#type) {
                     Some(ProtobufFixedOrPercent::Percent) => {
-                        Some(SplitSize::Percent(x.value as usize))
+                        Some(PercentOrFixed::Percent(x.value as usize))
+                    },
+                    Some(ProtobufFixedOrPercent::Fixed) => {
+                        Some(PercentOrFixed::Fixed(x.value as usize))
                     },
-                    Some(ProtobufFixedOrPercent::Fixed) => Some(SplitSize::Fixed(x.value as usize)),
                     None => None,
                 }),
             y: self
                 .y
                 .and_then(|y| match ProtobufFixedOrPercent::from_i32(y.r#type) {
                     Some(ProtobufFixedOrPercent::Percent) => {
-                        Some(SplitSize::Percent(y.value as usize))
+                        Some(PercentOrFixed::Percent(y.value as usize))
+                    },
+                    Some(ProtobufFixedOrPercent::Fixed) => {
+                        Some(PercentOrFixed::Fixed(y.value as usize))
                     },
-                    Some(ProtobufFixedOrPercent::Fixed) => Some(SplitSize::Fixed(y.value as usize)),
                     None => None,
                 }),
             width: self.width.and_then(|width| {
                 match ProtobufFixedOrPercent::from_i32(width.r#type) {
                     Some(ProtobufFixedOrPercent::Percent) => {
-                        Some(SplitSize::Percent(width.value as usize))
+                        Some(PercentOrFixed::Percent(width.value as usize))
                     },
                     Some(ProtobufFixedOrPercent::Fixed) => {
-                        Some(SplitSize::Fixed(width.value as usize))
+                        Some(PercentOrFixed::Fixed(width.value as usize))
                     },
                     None => None,
                 }
@@ -104,10 +108,10 @@ impl Into<FloatingPaneCoordinates> for ProtobufFloatingPaneCoordinates {
             height: self.height.and_then(|height| {
                 match ProtobufFixedOrPercent::from_i32(height.r#type) {
                     Some(ProtobufFixedOrPercent::Percent) => {
-                        Some(SplitSize::Percent(height.value as usize))
+                        Some(PercentOrFixed::Percent(height.value as usize))
                     },
                     Some(ProtobufFixedOrPercent::Fixed) => {
-                        Some(SplitSize::Fixed(height.value as usize))
+                        Some(PercentOrFixed::Fixed(height.value as usize))
                     },
                     None => None,
                 }
@@ -121,44 +125,44 @@ impl Into<ProtobufFloatingPaneCoordinates> for FloatingPaneCoordinates {
     fn into(self) -> ProtobufFloatingPaneCoordinates {
         ProtobufFloatingPaneCoordinates {
             x: match self.x {
-                Some(SplitSize::Percent(percent)) => Some(ProtobufFixedOrPercentValue {
+                Some(PercentOrFixed::Percent(percent)) => Some(ProtobufFixedOrPercentValue {
                     r#type: ProtobufFixedOrPercent::Percent as i32,
                     value: percent as u32,
                 }),
-                Some(SplitSize::Fixed(fixed)) => Some(ProtobufFixedOrPercentValue {
+                Some(PercentOrFixed::Fixed(fixed)) => Some(ProtobufFixedOrPercentValue {
                     r#type: ProtobufFixedOrPercent::Fixed as i32,
                     value: fixed as u32,
                 }),
                 None => None,
             },
             y: match self.y {
-                Some(SplitSize::Percent(percent)) => Some(ProtobufFixedOrPercentValue {
+                Some(PercentOrFixed::Percent(percent)) => Some(ProtobufFixedOrPercentValue {
                     r#type: ProtobufFixedOrPercent::Percent as i32,
                     value: percent as u32,
                 }),
-                Some(SplitSize::Fixed(fixed)) => Some(ProtobufFixedOrPercentValue {
+                Some(PercentOrFixed::Fixed(fixed)) => Some(ProtobufFixedOrPercentValue {
                     r#type: ProtobufFixedOrPercent::Fixed as i32,
                     value: fixed as u32,
                 }),
                 None => None,
             },
             width: match self.width {
-                Some(SplitSize::Percent(percent)) => Some(ProtobufFixedOrPercentValue {
+                Some(PercentOrFixed::Percent(percent)) => Some(ProtobufFixedOrPercentValue {
                     r#type: ProtobufFixedOrPercent::Percent as i32,
                     value: percent as u32,
                 }),
-                Some(SplitSize::Fixed(fixed)) => Some(ProtobufFixedOrPercentValue {
+                Some(PercentOrFixed::Fixed(fixed)) => Some(ProtobufFixedOrPercentValue {
                     r#type: ProtobufFixedOrPercent::Fixed as i32,
                     value: fixed as u32,
                 }),
                 None => None,
             },
             height: match self.height {
-                Some(SplitSize::Percent(percent)) => Some(ProtobufFixedOrPercentValue {
+                Some(PercentOrFixed::Percent(percent)) => Some(ProtobufFixedOrPercentValue {
                     r#type: ProtobufFixedOrPercent::Percent as i32,
                     value: percent as u32,
                 }),
-                Some(SplitSize::Fixed(fixed)) => Some(ProtobufFixedOrPercentValue {
+                Some(PercentOrFixed::Fixed(fixed)) => Some(ProtobufFixedOrPercentValue {
                     r#type: ProtobufFixedOrPercent::Fixed as i32,
                     value: fixed as u32,
                 }),