dash-frontend: tabs, other fixes (desc)
- set rustfmt line width to 120 columns by default for wgui - dashboard tabs - wgui: `remove_children`
This commit is contained in:
@@ -1,18 +1,38 @@
|
||||
use std::{cell::RefCell, collections::VecDeque, rc::Rc};
|
||||
|
||||
use glam::Vec2;
|
||||
use wgui::{
|
||||
components::button::ComponentButton,
|
||||
event::EventListenerCollection,
|
||||
globals::WguiGlobals,
|
||||
layout::{Layout, LayoutParams},
|
||||
layout::{LayoutParams, RcLayout},
|
||||
parser::{ParseDocumentParams, ParserState},
|
||||
};
|
||||
|
||||
use crate::tab::{
|
||||
Tab, TabParams, TabType, apps::TabApps, games::TabGames, home::TabHome, monado::TabMonado, processes::TabProcesses,
|
||||
settings::TabSettings,
|
||||
};
|
||||
|
||||
mod assets;
|
||||
mod tab;
|
||||
|
||||
pub struct Frontend {
|
||||
pub layout: Layout,
|
||||
pub layout: RcLayout,
|
||||
globals: WguiGlobals,
|
||||
|
||||
#[allow(dead_code)]
|
||||
state: ParserState,
|
||||
|
||||
current_tab: Option<Box<dyn Tab>>,
|
||||
|
||||
tasks: VecDeque<FrontendTask>,
|
||||
}
|
||||
|
||||
pub type RcFrontend = Rc<RefCell<Frontend>>;
|
||||
|
||||
pub enum FrontendTask {
|
||||
SetTab(TabType),
|
||||
}
|
||||
|
||||
pub struct FrontendParams<'a> {
|
||||
@@ -20,32 +40,126 @@ pub struct FrontendParams<'a> {
|
||||
}
|
||||
|
||||
impl Frontend {
|
||||
pub fn new(params: FrontendParams) -> anyhow::Result<Self> {
|
||||
pub fn new(params: FrontendParams) -> anyhow::Result<(RcFrontend, RcLayout)> {
|
||||
let globals = WguiGlobals::new(Box::new(assets::Asset {}))?;
|
||||
|
||||
let (layout, state) = wgui::parser::new_layout_from_assets(
|
||||
params.listeners,
|
||||
&ParseDocumentParams {
|
||||
globals,
|
||||
globals: globals.clone(),
|
||||
path: "gui/dashboard.xml",
|
||||
extra: Default::default(),
|
||||
},
|
||||
&LayoutParams {
|
||||
resize_to_parent: true,
|
||||
},
|
||||
&LayoutParams { resize_to_parent: true },
|
||||
)?;
|
||||
|
||||
Ok(Self { layout, state })
|
||||
let rc_layout = layout.as_rc();
|
||||
|
||||
let mut tasks = VecDeque::<FrontendTask>::new();
|
||||
tasks.push_back(FrontendTask::SetTab(TabType::Home));
|
||||
|
||||
let res = Rc::new(RefCell::new(Self {
|
||||
layout: rc_layout.clone(),
|
||||
state,
|
||||
current_tab: None,
|
||||
globals,
|
||||
tasks,
|
||||
}));
|
||||
|
||||
Frontend::register_buttons(&res)?;
|
||||
|
||||
Ok((res, rc_layout))
|
||||
}
|
||||
|
||||
pub fn update(&mut self, width: f32, height: f32, timeste_alpha: f32) -> anyhow::Result<()> {
|
||||
self
|
||||
pub fn update(
|
||||
rc_this: &RcFrontend,
|
||||
listeners: &mut EventListenerCollection<(), ()>,
|
||||
width: f32,
|
||||
height: f32,
|
||||
timestep_alpha: f32,
|
||||
) -> anyhow::Result<()> {
|
||||
let mut this = rc_this.borrow_mut();
|
||||
|
||||
while let Some(task) = this.tasks.pop_front() {
|
||||
this.process_task(rc_this, task, listeners)?;
|
||||
}
|
||||
|
||||
this
|
||||
.layout
|
||||
.update(Vec2::new(width, height), timeste_alpha)?;
|
||||
.borrow_mut()
|
||||
.update(Vec2::new(width, height), timestep_alpha)?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn get_layout(&mut self) -> &mut Layout {
|
||||
&mut self.layout
|
||||
pub fn get_layout(&self) -> &RcLayout {
|
||||
&self.layout
|
||||
}
|
||||
|
||||
pub fn push_task(&mut self, task: FrontendTask) {
|
||||
self.tasks.push_back(task);
|
||||
}
|
||||
|
||||
fn process_task(
|
||||
&mut self,
|
||||
rc_this: &RcFrontend,
|
||||
task: FrontendTask,
|
||||
listeners: &mut EventListenerCollection<(), ()>,
|
||||
) -> anyhow::Result<()> {
|
||||
match task {
|
||||
FrontendTask::SetTab(tab_type) => self.set_tab(tab_type, rc_this, listeners)?,
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn set_tab(
|
||||
&mut self,
|
||||
tab_type: TabType,
|
||||
rc_this: &RcFrontend,
|
||||
listeners: &mut EventListenerCollection<(), ()>,
|
||||
) -> anyhow::Result<()> {
|
||||
log::info!("Setting tab to {tab_type:?}");
|
||||
let mut layout = self.layout.borrow_mut();
|
||||
let widget_content = self.state.fetch_widget(&layout.state, "content")?;
|
||||
layout.remove_children(widget_content.id);
|
||||
|
||||
let tab_params = TabParams {
|
||||
globals: &self.globals,
|
||||
layout: &mut layout,
|
||||
parent_id: widget_content.id,
|
||||
listeners,
|
||||
frontend: rc_this,
|
||||
};
|
||||
|
||||
let tab: Box<dyn Tab> = match tab_type {
|
||||
TabType::Home => Box::new(TabHome::new(tab_params)?),
|
||||
TabType::Apps => Box::new(TabApps::new(tab_params)?),
|
||||
TabType::Games => Box::new(TabGames::new(tab_params)?),
|
||||
TabType::Monado => Box::new(TabMonado::new(tab_params)?),
|
||||
TabType::Processes => Box::new(TabProcesses::new(tab_params)?),
|
||||
TabType::Settings => Box::new(TabSettings::new(tab_params)?),
|
||||
};
|
||||
|
||||
self.current_tab = Some(tab);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn register_buttons(rc_this: &RcFrontend) -> anyhow::Result<()> {
|
||||
let this = rc_this.borrow_mut();
|
||||
let btn_home = this.state.fetch_component_as::<ComponentButton>("btn_side_home")?;
|
||||
let btn_apps = this.state.fetch_component_as::<ComponentButton>("btn_side_apps")?;
|
||||
let btn_games = this.state.fetch_component_as::<ComponentButton>("btn_side_games")?;
|
||||
let btn_monado = this.state.fetch_component_as::<ComponentButton>("btn_side_monado")?;
|
||||
let btn_processes = this.state.fetch_component_as::<ComponentButton>("btn_side_processes")?;
|
||||
let btn_settings = this.state.fetch_component_as::<ComponentButton>("btn_side_settings")?;
|
||||
|
||||
TabType::register_button(rc_this.clone(), &btn_home, TabType::Home);
|
||||
TabType::register_button(rc_this.clone(), &btn_apps, TabType::Apps);
|
||||
TabType::register_button(rc_this.clone(), &btn_games, TabType::Games);
|
||||
TabType::register_button(rc_this.clone(), &btn_monado, TabType::Monado);
|
||||
TabType::register_button(rc_this.clone(), &btn_processes, TabType::Processes);
|
||||
TabType::register_button(rc_this.clone(), &btn_settings, TabType::Settings);
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user