From 97fcde1a3ba4a2072efe079d5340e41bc7483346 Mon Sep 17 00:00:00 2001 From: Aleksander Date: Fri, 6 Mar 2026 18:34:24 +0100 Subject: [PATCH] rebase --- dash-frontend/src/tab/monado.rs | 6 ++---- wgui/src/components/bar_graph.rs | 16 ++++------------ 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/dash-frontend/src/tab/monado.rs b/dash-frontend/src/tab/monado.rs index 5ae3b6b7..4235464f 100644 --- a/dash-frontend/src/tab/monado.rs +++ b/dash-frontend/src/tab/monado.rs @@ -8,13 +8,13 @@ use wgui::{ slider::ComponentSlider, tabs::ComponentTabs, }, - drawing::{self, Color}, + drawing::Color, globals::WguiGlobals, layout::{Layout, WidgetID}, parser::{self, Fetchable, ParseDocumentParams, ParserData, ParserState}, task::Tasks, }; -use wlx_common::dash_interface::{self, DashInterface, MonadoDumpSessionFrame}; +use wlx_common::dash_interface::{self, MonadoDumpSessionFrame}; use crate::{ frontend::Frontend, @@ -288,8 +288,6 @@ impl SubtabDebugTimings { let id_parent = state.get_widget_id("parent")?; - let mut graphs: Vec = Vec::new(); - let mut graph = |name: &'static str, limits: (f32, f32)| -> anyhow::Result { mount_graph( &mut state, diff --git a/wgui/src/components/bar_graph.rs b/wgui/src/components/bar_graph.rs index 6398e4be..083369a4 100644 --- a/wgui/src/components/bar_graph.rs +++ b/wgui/src/components/bar_graph.rs @@ -110,8 +110,6 @@ pub fn construct( ess: &mut ConstructEssentials, mut params: Params, ) -> anyhow::Result<(WidgetPair, Rc)> { - let globals = ess.layout.state.globals.clone(); - params.style.flex_direction = FlexDirection::Row; params.style.gap = length(4.0); @@ -213,17 +211,11 @@ pub fn construct( ..Default::default() }; - let (label_val_max, _) = ess.layout.add_child( - vertical_texts.id, - WidgetLabel::create(&mut globals.get(), label_params.clone()), - Default::default(), - )?; + let label = WidgetLabel::create(&mut ess.layout.state, label_params.clone()); + let (label_val_max, _) = ess.layout.add_child(vertical_texts.id, label, Default::default())?; - let (label_val_min, _) = ess.layout.add_child( - vertical_texts.id, - WidgetLabel::create(&mut globals.get(), label_params), - Default::default(), - )?; + let label = WidgetLabel::create(&mut ess.layout.state, label_params); + let (label_val_min, _) = ess.layout.add_child(vertical_texts.id, label, Default::default())?; let data = Rc::new(Data { id_root: root.id,