add ParentFill widget size option

Grokmoo · Grokmoo · commit 44547448b80c · 2025-02-17T14:54:44.000-08:00
diff --git a/src/theme_definition.rs b/src/theme_definition.rs
@@ -547,6 +547,10 @@ pub enum WidthRelative {
     /// Width is equal to the parent widget's inner width plus the `x` field of the widget's `size`.
     Parent,
 
+    /// Widget is set such that this widget fills the parent widget's inner widget, accounting for this
+    /// widget's position within the parent, plus the `x` field of the widget's `size`
+    ParentFill,
+
     /// Width is equal to the text layout width plus the `x` field of the widget's `size`.
     Text,
 }
@@ -562,6 +566,10 @@ pub enum HeightRelative {
     /// Height is equal to the parent widget's inner height plus the `y` field of the widget's `size`.
     Parent,
 
+    /// Height is set such that this widget fills the parent widget's inner height, accounting for this
+    /// widget's position within the parent, plus the `y` field of the widget's `size`
+    ParentFill,
+
     /// Height is sized so that the widget's inner height just encompasses all child widgets, plus the `y` field
     /// of the widget's `size`.  Note that any children of this Widget should not use `Parent` height if this
     /// is used.
diff --git a/src/widget.rs b/src/widget.rs
@@ -431,19 +431,27 @@ impl<'a> WidgetBuilder<'a> {
         let x = match self.data.width_from {
             WidthRelative::Children => raw.x, // this will be added to after children are layed out
             WidthRelative::Normal => raw.x,
-            WidthRelative::Parent => raw.x + parent.size.x - parent.border.horizontal(),
+            WidthRelative::Parent | WidthRelative::ParentFill => raw.x + parent.size.x - parent.border.horizontal(),
             WidthRelative::Text => raw.x + self.calculate_single_line_text_width() + 2.0 * widget.border.horizontal(),
         };
+
         let y = match self.data.height_from {
             HeightRelative::Children => raw.y, // this will be added to after children are layed out
             HeightRelative::Normal => raw.y,
-            HeightRelative::Parent => raw.y + parent.size.y - parent.border.vertical(),
+            HeightRelative::Parent | HeightRelative::ParentFill => raw.y + parent.size.y - parent.border.vertical(),
             HeightRelative::FontLine => raw.y + widget.font.map_or(0.0, |sum| sum.line_height) + widget.border.vertical(),
         };
-        let self_size = Point { x, y } + state_resize;
+        let mut self_size = Point { x, y } + state_resize;
 
         let pos = pos(parent, self.data.raw_pos, self_size, self.data.align);
 
+        if let HeightRelative::ParentFill = self.data.height_from {
+            self_size.y -= pos.y - parent.pos.y;
+        }
+        if let WidthRelative::ParentFill = self.data.width_from {
+            self_size.x -= pos.x - parent.pos.x;
+        }
+
         self.widget.pos = pos + state_moved;
         self.widget.size = self_size;
         self.data.recalc_pos_size = false;
