RomanNum3ral
/
wayvr
mirror of https://github.com/wayvr-org/wayvr.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rebase

This commit is contained in:
Aleksander 2026-03-06 18:34:24 +01:00
parent c16c403966
commit 97fcde1a3b
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dash-frontend/src/tab/monado.rs
View File

@ -8,13 +8,13 @@ use wgui::{
slider::ComponentSlider, slider::ComponentSlider,
tabs::ComponentTabs, tabs::ComponentTabs,
}, },
drawing::{self, Color}, drawing::Color,
globals::WguiGlobals, globals::WguiGlobals,
layout::{Layout, WidgetID}, layout::{Layout, WidgetID},
parser::{self, Fetchable, ParseDocumentParams, ParserData, ParserState}, parser::{self, Fetchable, ParseDocumentParams, ParserData, ParserState},
task::Tasks, task::Tasks,
}; };
use wlx_common::dash_interface::{self, DashInterface, MonadoDumpSessionFrame}; use wlx_common::dash_interface::{self, MonadoDumpSessionFrame};
use crate::{ use crate::{
frontend::Frontend, frontend::Frontend,
@ -288,8 +288,6 @@ impl SubtabDebugTimings {
let id_parent = state.get_widget_id("parent")?; let id_parent = state.get_widget_id("parent")?;
let mut graphs: Vec<DebugGraph> = Vec::new();
let mut graph = |name: &'static str, limits: (f32, f32)| -> anyhow::Result<DebugGraph> { let mut graph = |name: &'static str, limits: (f32, f32)| -> anyhow::Result<DebugGraph> {
mount_graph( mount_graph(
&mut state, &mut state,

16
wgui/src/components/bar_graph.rs
View File

@ -110,8 +110,6 @@ pub fn construct(
ess: &mut ConstructEssentials, ess: &mut ConstructEssentials,
mut params: Params, mut params: Params,
) -> anyhow::Result<(WidgetPair, Rc<ComponentBarGraph>)> { ) -> anyhow::Result<(WidgetPair, Rc<ComponentBarGraph>)> {
let globals = ess.layout.state.globals.clone();
params.style.flex_direction = FlexDirection::Row; params.style.flex_direction = FlexDirection::Row;
params.style.gap = length(4.0); params.style.gap = length(4.0);
@ -213,17 +211,11 @@ pub fn construct(
..Default::default() ..Default::default()
}; };
let (label_val_max, _) = ess.layout.add_child( let label = WidgetLabel::create(&mut ess.layout.state, label_params.clone());
vertical_texts.id, let (label_val_max, _) = ess.layout.add_child(vertical_texts.id, label, Default::default())?;
WidgetLabel::create(&mut globals.get(), label_params.clone()),
Default::default(),
)?;
let (label_val_min, _) = ess.layout.add_child( let label = WidgetLabel::create(&mut ess.layout.state, label_params);
vertical_texts.id, let (label_val_min, _) = ess.layout.add_child(vertical_texts.id, label, Default::default())?;
WidgetLabel::create(&mut globals.get(), label_params),
Default::default(),
)?;
let data = Rc::new(Data { let data = Rc::new(Data {
id_root: root.id, id_root: root.id,