From 2f88b3b2c2cdd393abe54d96145f48e7db20aab2 Mon Sep 17 00:00:00 2001 From: Joe Ardent Date: Thu, 31 Jul 2025 09:43:56 -0700 Subject: [PATCH] better layout code --- src/frontend/mod.rs | 27 +++++++++------------------ src/main.rs | 2 -- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/src/frontend/mod.rs b/src/frontend/mod.rs index a4c3b32..d972972 100644 --- a/src/frontend/mod.rs +++ b/src/frontend/mod.rs @@ -266,26 +266,17 @@ static LOGGING_MENU: LazyLock = LazyLock::new(|| { impl Widget for &App { fn render(self, area: Rect, buf: &mut Buffer) { - let [top, _middle, bottom] = - Layout::vertical([Constraint::Min(5), Constraint::Min(10), Constraint::Min(3)]) - .split(area) - .as_array() - .cloned() - .unwrap(); + let main_layout = + Layout::vertical([Constraint::Min(5), Constraint::Min(10), Constraint::Min(3)]); + let [top, _middle, bottom] = main_layout.areas(area); - let [footer_left, footer_right] = - Layout::horizontal([Constraint::Percentage(30), Constraint::Percentage(70)]) - .split(bottom) - .as_array() - .cloned() - .unwrap(); + let footer_layout = + Layout::horizontal([Constraint::Percentage(30), Constraint::Percentage(70)]); + let [footer_left, footer_right] = footer_layout.areas(bottom); - let [_header_left, header_right] = - Layout::horizontal([Constraint::Percentage(50), Constraint::Percentage(50)]) - .split(top) - .as_array() - .cloned() - .unwrap(); + let header_layout = + Layout::horizontal([Constraint::Percentage(50), Constraint::Percentage(50)]); + let [_header_left, header_right] = header_layout.areas(top); let mode = self.screen.last().unwrap(); match mode { diff --git a/src/main.rs b/src/main.rs index 7ee1d11..eecf980 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,3 @@ -#![feature(slice_as_array)] - use frontend::App; use joecalsend::{Config, error, models::Device}; use local_ip_address::local_ip;