git.lucas.co / cce-system-interface
system settings
git clone https://git.lucas.co/cce-system-interface.git

commitd86e4a727b18c1ab08446b80eef9e1482908e4c0
parent5abe1b62d3
authorLucas Galante <[email protected]>
date2026-06-16 17:46
Rename GridLayout to AdaptiveGrid, and update Interface page layout label to Adaptive Grid

 src/main.rs            | 4 ++--
 src/pages/audio.rs     | 4 ++--
 src/pages/display.rs   | 2 +-
 src/pages/interface.rs | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index e72a813..65141de 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1433,13 +1433,13 @@ fn collect_popover_rects(w: &dyn cce_ui::widget::Element, popovers: &mut Vec<(f3
 
     fn render_page_content(&mut self, cx: f32, cy: f32, cw: f32, ch: f32) -> PageContent {
         use pages::*;
-        use cce_ui::layout::GridLayout;
+        use cce_ui::layout::AdaptiveGrid;
         let margin = cce_ui::layout::page_margin();
         let cx = cx + margin;
         let cy = cy + margin;
         let cw = (cw - 2.0 * margin).max(1.0);
         let ch = (ch - 2.0 * margin).max(1.0);
-        let mut layout = GridLayout::new(260.0, 20.0);
+        let mut layout = AdaptiveGrid::new(260.0, 20.0);
         let page_idx = Page::ALL.iter().position(|&p| p == self.app.current_page).unwrap_or(0);
         let root_focused = cce_ui::widget::focus::is_focused(&self.plates[page_idx]);
         let sec_focused: Vec<bool> = self.page_sec_containers.iter()
diff --git a/src/pages/audio.rs b/src/pages/audio.rs
index 4cd3f47..0cd8f92 100644
--- a/src/pages/audio.rs
+++ b/src/pages/audio.rs
@@ -401,12 +401,12 @@ pub fn update(state: &mut AudioState, msg: AudioMessage) {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use cce_ui::layout::GridLayout;
+    use cce_ui::layout::AdaptiveGrid;
 
     #[test]
     fn test_view_layout_grid() {
         let mut state = AudioState::default();
-        let mut layout = GridLayout::new(260.0, 20.0);
+        let mut layout = AdaptiveGrid::new(260.0, 20.0);
         let pc = view(&mut state, 10.0, 20.0, 800.0, 600.0, &[false, false], &mut layout, &mut cce_ui::context::UiContext::new());
         assert!(!pc.rects.is_empty() || !pc.texts.is_empty());
     }
diff --git a/src/pages/display.rs b/src/pages/display.rs
index c01689b..d9f6c08 100644
--- a/src/pages/display.rs
+++ b/src/pages/display.rs
@@ -579,7 +579,7 @@ mod tests {
     #[test]
     fn test_view_layout_grid() {
         let mut state = DisplayState::default();
-        let mut layout = cce_ui::layout::GridLayout::new(260.0, 20.0);
+        let mut layout = cce_ui::layout::AdaptiveGrid::new(260.0, 20.0);
         let pc = view(&mut state, 10.0, 20.0, 800.0, 600.0, &mut layout, &mut cce_ui::context::UiContext::new());
         assert!(!pc.rects.is_empty() || !pc.texts.is_empty());
     }
diff --git a/src/pages/interface.rs b/src/pages/interface.rs
index bd7b703..1340f24 100644
--- a/src/pages/interface.rs
+++ b/src/pages/interface.rs
@@ -1442,7 +1442,7 @@ pub fn view(state: &mut InterfaceState, cx: f32, cy: f32, cw: f32, ch: f32, sec_
         sec.spacing(12.0);
 
         // Grid Layout child section
-        sec.add_section("Grid Layout", false, |subsec| {
+        sec.add_section("Adaptive Grid", false, |subsec| {
             subsec.spacing(8.0);
             state.grid_min_col_width_spinbox.value = state.grid_min_col_width as i32;
             subsec.widget_full(&mut state.grid_min_col_width_spinbox, 44.0, ctx);