Merge branch 'grid-api-improve'

Author: NoraCodes

iui/examples/inputs-grid.rs

@@ -4,7 +4,7 @@
 extern crate iui;
 use iui::prelude::*;
 use iui::controls::{Label, Spinbox, Slider, Entry, MultilineEntry, LayoutGrid, 
-    GridAlignment, HorizontalSeparator};
+    GridAlignment, GridExpand, HorizontalSeparator};
 use std::rc::Rc;
 use std::cell::RefCell;
 
@@ -43,17 +43,17 @@ fn main() {
             // This is position (by slot) and size, expansion, and alignment.
             // In this case, row 0, col 0, 1 by 1, compress as much as possible,
             // and align to the fill.
-            0, 0, 1, 1, false, false, GridAlignment::Fill, GridAlignment::Fill);
+            0, 0, 1, 1, GridExpand::Neither, GridAlignment::Fill, GridAlignment::Fill);
         grid.append(&ui, spinner.clone(),
             // This one is at column zero, row 1.
-            0, 1, 1, 1, false, false, GridAlignment::Fill, GridAlignment::Fill);
+            0, 1, 1, 1, GridExpand::Neither, GridAlignment::Fill, GridAlignment::Fill);
         grid.append(&ui, HorizontalSeparator::new(&ui),
-            0, 3, 1, 1, false, false, GridAlignment::Fill, GridAlignment::Fill);
+            0, 3, 1, 1, GridExpand::Neither, GridAlignment::Fill, GridAlignment::Fill);
         grid.append(&ui, entry.clone(),
-            0, 4, 1, 1, false, false, GridAlignment::Fill, GridAlignment::Fill);
+            0, 4, 1, 1, GridExpand::Neither, GridAlignment::Fill, GridAlignment::Fill);
         grid.append(&ui, multi.clone(),
             // The multiline entry is at column 0, row 1, and expands vertically.
-            0, 5, 1, 1, false, true, GridAlignment::Fill, GridAlignment::Fill);
+            0, 5, 1, 1, GridExpand::Vertical, GridAlignment::Fill, GridAlignment::Fill);
         (slider, spinner, entry, multi)
     };
 
@@ -65,13 +65,15 @@ fn main() {
         let text_label = Label::new(&ui, "");
         let bigtext_label = Label::new(&ui, "");
         grid.append(&ui, add_label.clone(), 
-            1, 0, 1, 1, false, false, GridAlignment::Fill, GridAlignment::Fill);
+            1, 0, 1, 1, GridExpand::Neither, GridAlignment::Fill, GridAlignment::Fill);
         grid.append(&ui, sub_label.clone(),
-            1, 1, 1, 1, false, false, GridAlignment::Fill, GridAlignment::Fill);
+            1, 1, 1, 1, GridExpand::Neither, GridAlignment::Fill, GridAlignment::Fill);
+        // We skip the #2 & 3 slots so that the text labels will align with their inputs.
+        // This is important because the big text label can expand vertically.
         grid.append(&ui, text_label.clone(),
-            1, 2, 1, 1, false, false, GridAlignment::Fill, GridAlignment::Fill);
+            1, 4, 1, 1, GridExpand::Neither, GridAlignment::Fill, GridAlignment::Fill);
         grid.append(&ui, bigtext_label.clone(),
-            1, 3, 1, 1, false, false, GridAlignment::Fill, GridAlignment::Fill);
+            1, 5, 1, 1, GridExpand::Neither, GridAlignment::Fill, GridAlignment::Fill);
         (add_label, sub_label, text_label, bigtext_label)
     };
 

iui/src/controls/layout.rs

@@ -251,6 +251,19 @@ impl Spacer {
     }
 }
 
+/// Informs a `LayoutGrid` about how a control should use available space
+/// in one or both dimensions.
+pub enum GridExpand {
+    /// This control should not use extra space
+    Neither,
+    /// This control should use extra space horizontally
+    Horizontal,
+    /// This control should use extra space vertically
+    Vertical,
+    /// This control should use all available space in both dimensions
+    Both
+}
+
 /// Informs a `LayoutGrid` how to align a control.
 #[derive(Clone, Copy, PartialEq)]
 pub enum GridAlignment {
@@ -334,10 +347,14 @@ impl LayoutGrid {
     pub fn append<T: Into<Control>>(&mut self, _ctx: &UI, control: T,
                                     left: i32, height: i32,
                                     xspan: i32, yspan: i32,
-                                    hexpand: bool, vexpand: bool,
+                                    expand: GridExpand,
                                     halign: GridAlignment, valign: GridAlignment) {
-        let hexpand = if hexpand { 1 } else { 0 }; 
-        let vexpand = if vexpand { 1 } else { 0 };
+        let (hexpand, vexpand) = match expand {
+            GridExpand::Neither => (0, 0),
+            GridExpand::Horizontal => (1, 0),
+            GridExpand::Vertical => (0, 1),
+            GridExpand::Both => (1, 1),
+        };
         unsafe { 
             ui_sys::uiGridAppend(
                 self.uiGrid, control.into().ui_control, left, height, xspan, yspan,