From 54767d75da95740c8c2acbc10302410bd9bacc81 Mon Sep 17 00:00:00 2001 From: Aleksander Date: Mon, 15 Sep 2025 20:37:55 +0200 Subject: [PATCH] dash-frontend: tabs, other fixes (desc) - set rustfmt line width to 120 columns by default for wgui - dashboard tabs - wgui: `remove_children` --- Cargo.lock | 1 + dash-frontend/Cargo.toml | 1 + dash-frontend/assets/gui/dashboard.xml | 47 +++--- .../gui/{templates.xml => t_menu_button.xml} | 3 + dash-frontend/assets/gui/tab/apps.xml | 7 + dash-frontend/assets/gui/tab/games.xml | 5 + dash-frontend/assets/gui/tab/home.xml | 18 +++ dash-frontend/assets/gui/tab/monado.xml | 5 + dash-frontend/assets/gui/tab/processes.xml | 5 + dash-frontend/assets/gui/tab/settings.xml | 5 + dash-frontend/rustfmt.toml | 3 +- dash-frontend/src/lib.rs | 140 ++++++++++++++++-- dash-frontend/src/tab/apps.rs | 31 ++++ dash-frontend/src/tab/games.rs | 31 ++++ dash-frontend/src/tab/home.rs | 47 ++++++ dash-frontend/src/tab/mod.rs | 51 +++++++ dash-frontend/src/tab/monado.rs | 31 ++++ dash-frontend/src/tab/processes.rs | 31 ++++ dash-frontend/src/tab/settings.rs | 31 ++++ uidev/src/main.rs | 26 ++-- uidev/src/testbed/mod.rs | 15 +- uidev/src/testbed/testbed_any.rs | 27 ++-- uidev/src/testbed/testbed_dashboard.rs | 29 ++-- uidev/src/testbed/testbed_generic.rs | 39 +++-- wgui/rustfmt.toml | 3 +- wgui/src/layout.rs | 79 ++++++---- wgui/src/parser/component_checkbox.rs | 3 +- wgui/src/parser/component_slider.rs | 5 +- wgui/src/parser/mod.rs | 81 +++------- wgui/src/widget/mod.rs | 15 +- 30 files changed, 624 insertions(+), 191 deletions(-) rename dash-frontend/assets/gui/{templates.xml => t_menu_button.xml} (91%) create mode 100644 dash-frontend/assets/gui/tab/apps.xml create mode 100644 dash-frontend/assets/gui/tab/games.xml create mode 100644 dash-frontend/assets/gui/tab/home.xml create mode 100644 dash-frontend/assets/gui/tab/monado.xml create mode 100644 dash-frontend/assets/gui/tab/processes.xml create mode 100644 dash-frontend/assets/gui/tab/settings.xml create mode 100644 dash-frontend/src/tab/apps.rs create mode 100644 dash-frontend/src/tab/games.rs create mode 100644 dash-frontend/src/tab/home.rs create mode 100644 dash-frontend/src/tab/mod.rs create mode 100644 dash-frontend/src/tab/monado.rs create mode 100644 dash-frontend/src/tab/processes.rs create mode 100644 dash-frontend/src/tab/settings.rs diff --git a/Cargo.lock b/Cargo.lock index aa605b6..5e0d05f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1367,6 +1367,7 @@ version = "0.1.0" dependencies = [ "anyhow", "glam", + "log", "rust-embed", "wgui", ] diff --git a/dash-frontend/Cargo.toml b/dash-frontend/Cargo.toml index b920dad..63934c2 100644 --- a/dash-frontend/Cargo.toml +++ b/dash-frontend/Cargo.toml @@ -7,4 +7,5 @@ edition = "2024" anyhow.workspace = true wgui = { path = "../wgui/" } glam = { workspace = true } +log = { workspace = true } rust-embed = "8.7.2" diff --git a/dash-frontend/assets/gui/dashboard.xml b/dash-frontend/assets/gui/dashboard.xml index 60f1904..4cb476e 100644 --- a/dash-frontend/assets/gui/dashboard.xml +++ b/dash-frontend/assets/gui/dashboard.xml @@ -1,11 +1,25 @@ - + + + + @@ -13,7 +27,7 @@
- diff --git a/dash-frontend/assets/gui/templates.xml b/dash-frontend/assets/gui/t_menu_button.xml similarity index 91% rename from dash-frontend/assets/gui/templates.xml rename to dash-frontend/assets/gui/t_menu_button.xml index 283f176..2616e10 100644 --- a/dash-frontend/assets/gui/templates.xml +++ b/dash-frontend/assets/gui/t_menu_button.xml @@ -1,6 +1,9 @@ + +