diff --git a/uidev/src/testbed/testbed_any.rs b/uidev/src/testbed/testbed_any.rs index 794670c..a5ac9c9 100644 --- a/uidev/src/testbed/testbed_any.rs +++ b/uidev/src/testbed/testbed_any.rs @@ -20,7 +20,8 @@ impl TestbedAny { let globals = WguiGlobals::new(Box::new(assets::Asset {}))?; - let (layout, state) = wgui::parser::new_layout_from_assets(globals, listeners, &path)?; + let (layout, state) = + wgui::parser::new_layout_from_assets(globals, listeners, &path, false)?; Ok(Self { layout, state }) } } diff --git a/uidev/src/testbed/testbed_generic.rs b/uidev/src/testbed/testbed_generic.rs index bc7203a..9f1d123 100644 --- a/uidev/src/testbed/testbed_generic.rs +++ b/uidev/src/testbed/testbed_generic.rs @@ -17,7 +17,8 @@ impl TestbedGeneric { let globals = WguiGlobals::new(Box::new(assets::Asset {}))?; - let (layout, state) = wgui::parser::new_layout_from_assets(globals, listeners, XML_PATH)?; + let (layout, state) = + wgui::parser::new_layout_from_assets(globals, listeners, XML_PATH, false)?; Ok(Self { layout, state }) } diff --git a/wgui/src/parser/mod.rs b/wgui/src/parser/mod.rs index 8675f46..7c6bfed 100644 --- a/wgui/src/parser/mod.rs +++ b/wgui/src/parser/mod.rs @@ -75,6 +75,7 @@ impl ParserState { listeners: &mut EventListenerCollection, widget_id: WidgetID, template_parameters: HashMap, Rc>, + dev_mode: bool, ) -> anyhow::Result<()> { let Some(template) = self.templates.get(template_name) else { anyhow::bail!("no template named \"{}\" found", template_name); @@ -88,6 +89,7 @@ impl ParserState { var_map: self.var_map.clone(), // FIXME: prevent copying components: self.components.clone(), // FIXME: prevent copying templates: Default::default(), + dev_mode, }; let file = ParserFile { @@ -126,6 +128,7 @@ struct ParserContext<'a, U1, U2> { ids: HashMap, WidgetID>, templates: HashMap, Rc + +
@@ -38,14 +47,31 @@
+
diff --git a/wlx-overlay-s/src/assets/watch/edit.svg b/wlx-overlay-s/src/assets/watch/edit.svg new file mode 100644 index 0000000..88e3c25 --- /dev/null +++ b/wlx-overlay-s/src/assets/watch/edit.svg @@ -0,0 +1 @@ + diff --git a/wlx-overlay-s/src/assets/watch/home.svg b/wlx-overlay-s/src/assets/watch/home.svg new file mode 100644 index 0000000..71a6c45 --- /dev/null +++ b/wlx-overlay-s/src/assets/watch/home.svg @@ -0,0 +1 @@ + diff --git a/wlx-overlay-s/src/assets/watch/set2.svg b/wlx-overlay-s/src/assets/watch/set2.svg new file mode 100644 index 0000000..487afb8 --- /dev/null +++ b/wlx-overlay-s/src/assets/watch/set2.svg @@ -0,0 +1 @@ + diff --git a/wlx-overlay-s/src/gui/panel.rs b/wlx-overlay-s/src/gui/panel.rs index f2f11ee..61cea3b 100644 --- a/wlx-overlay-s/src/gui/panel.rs +++ b/wlx-overlay-s/src/gui/panel.rs @@ -44,8 +44,12 @@ impl GuiPanel { pub fn new_from_template(app: &mut AppState, path: &str, state: S) -> anyhow::Result { let mut listeners = EventListenerCollection::::default(); - let (layout, parser_state) = - wgui::parser::new_layout_from_assets(app.wgui_globals.clone(), &mut listeners, path)?; + let (layout, parser_state) = wgui::parser::new_layout_from_assets( + app.wgui_globals.clone(), + &mut listeners, + path, + false, + )?; let context = WguiContext::new(&mut app.wgui_shared, 1.0)?; let mut timestep = Timestep::new(); diff --git a/wlx-overlay-s/src/overlays/keyboard/builder.rs b/wlx-overlay-s/src/overlays/keyboard/builder.rs index e179f5d..682201f 100644 --- a/wlx-overlay-s/src/overlays/keyboard/builder.rs +++ b/wlx-overlay-s/src/overlays/keyboard/builder.rs @@ -79,6 +79,7 @@ where app.wgui_globals.clone(), &mut panel.listeners, "gui/keyboard.xml", + false, )?; for row in 0..layout.key_sizes.len() { @@ -163,6 +164,7 @@ where &mut panel.listeners, div, params, + false, )?; if let Some(widget_id) = gui_state_key.ids.get(&*my_id) {