ParserState: add fetch_component_by_widget_id

wgui/src/parser/component_button.rs

@@ -56,11 +56,7 @@ pub fn parse_component_button<'a, U1, U2>(
 
 	// slight border outlines by default
 	if border_color.is_none() {
-		border_color = Some(Color::lerp(
+		border_color = Some(Color::lerp(&color, &Color::new(0.0, 0.0, 0.0, color.a), 0.3));
-			&color,
-			&Color::new(0.0, 0.0, 0.0, color.a),
-			0.3,
-		));
 	}
 
 	if hover_color.is_none() {
@@ -87,7 +83,7 @@ pub fn parse_component_button<'a, U1, U2>(
 		},
 	)?;
 
-	process_component(file, ctx, node, Component(component));
+	process_component(file, ctx, node, Component(component), new_id);
 	parse_children(file, ctx, node, new_id)?;
 
 	Ok(new_id)

wgui/src/parser/component_checkbox.rs

@@ -50,7 +50,7 @@ pub fn parse_component_checkbox<'a, U1, U2>(
 		},
 	)?;
 
-	process_component(file, ctx, node, Component(component));
+	process_component(file, ctx, node, Component(component), new_id);
 
 	Ok(new_id)
 }

wgui/src/parser/component_slider.rs

@@ -46,7 +46,7 @@ pub fn parse_component_slider<'a, U1, U2>(
 		},
 	)?;
 
-	process_component(file, ctx, node, Component(component));
+	process_component(file, ctx, node, Component(component), new_id);
 
 	Ok(new_id)
 }

wgui/src/parser/mod.rs

@@ -59,14 +59,15 @@ pub struct ParserState {
 	macro_attribs: HashMap<Rc<str>, MacroAttribs>,
 	pub var_map: HashMap<Rc<str>, Rc<str>>,
 	pub components: Vec<Component>,
-	pub components_id_map: HashMap<Rc<str>, std::rc::Weak<dyn ComponentTrait>>,
+	pub components_by_id: HashMap<Rc<str>, std::rc::Weak<dyn ComponentTrait>>,
+	pub components_by_widget_id: HashMap<WidgetID, std::rc::Weak<dyn ComponentTrait>>,
 	pub templates: HashMap<Rc<str>, Rc<Template>>,
 	pub path: PathBuf,
 }
 
 impl ParserState {
-	pub fn fetch_component(&self, id: &str) -> anyhow::Result<Component> {
+	pub fn fetch_component_by_id(&self, id: &str) -> anyhow::Result<Component> {
-		let Some(weak) = self.components_id_map.get(id) else {
+		let Some(weak) = self.components_by_id.get(id) else {
 			anyhow::bail!("Component by ID \"{}\" doesn't exist", id);
 		};
 
@@ -77,8 +78,20 @@ impl ParserState {
 		Ok(Component(component))
 	}
 
+	pub fn fetch_component_by_widget_id(&self, widget_id: WidgetID) -> anyhow::Result<Component> {
+		let Some(weak) = self.components_by_widget_id.get(&widget_id) else {
+			anyhow::bail!("Component by widget ID \"{:?}\" doesn't exist", widget_id);
+		};
+
+		let Some(component) = weak.upgrade() else {
+			anyhow::bail!("Component by widget ID \"{:?}\" doesn't exist", widget_id);
+		};
+
+		Ok(Component(component))
+	}
+
 	pub fn fetch_component_as<T: 'static>(&self, id: &str) -> anyhow::Result<Rc<T>> {
-		let component = self.fetch_component(id)?;
+		let component = self.fetch_component_by_id(id)?;
 
 		if !(*component.0).as_any().is::<T>() {
 			anyhow::bail!("fetch_component_as({}): type not matching", id);
@@ -88,6 +101,17 @@ impl ParserState {
 		unsafe { Ok(Rc::from_raw(Rc::into_raw(component.0).cast())) }
 	}
 
+	pub fn fetch_component_from_widget_id_as<T: 'static>(&self, widget_id: WidgetID) -> anyhow::Result<Rc<T>> {
+		let component = self.fetch_component_by_widget_id(widget_id)?;
+
+		if !(*component.0).as_any().is::<T>() {
+			anyhow::bail!("fetch_component_by_widget_id({:?}): type not matching", widget_id);
+		}
+
+		// safety: we already checked it above, should be safe to directly cast it
+		unsafe { Ok(Rc::from_raw(Rc::into_raw(component.0).cast())) }
+	}
+
 	pub fn get_widget_id(&self, id: &str) -> anyhow::Result<WidgetID> {
 		match self.ids.get(id) {
 			Some(id) => Ok(*id),
@@ -127,7 +151,8 @@ impl ParserState {
 			macro_attribs: self.macro_attribs.clone(),       // FIXME: prevent copying
 			var_map: self.var_map.clone(),                   // FIXME: prevent copying
 			components: self.components.clone(),             // FIXME: prevent copying
-			components_id_map: self.components_id_map.clone(), // FIXME: prevent copying
+			components_by_id: self.components_by_id.clone(), // FIXME: prevent copying
+			components_by_widget_id: self.components_by_widget_id.clone(), // FIXME: prevent copying
 			templates: Default::default(),
 			doc_params,
 		};
@@ -162,8 +187,10 @@ struct ParserContext<'a, U1, U2> {
 	macro_attribs: HashMap<Rc<str>, MacroAttribs>,
 	ids: HashMap<Rc<str>, WidgetID>,
 	templates: HashMap<Rc<str>, Rc<Template>>,
+
 	components: Vec<Component>,
-	components_id_map: HashMap<Rc<str>, ComponentWeak>,
+	components_by_id: HashMap<Rc<str>, ComponentWeak>,
+	components_by_widget_id: HashMap<WidgetID, ComponentWeak>,
 }
 
 // Parses a color from a HTML hex string
@@ -544,14 +571,17 @@ fn process_component<'a, U1, U2>(
 	ctx: &mut ParserContext<U1, U2>,
 	node: roxmltree::Node<'a, 'a>,
 	component: Component,
+	widget_id: WidgetID,
 ) {
+	ctx.components_by_widget_id.insert(widget_id, component.weak());
+
 	let attribs: Vec<_> = iter_attribs(file, ctx, &node, false).collect();
 
 	for (key, value) in attribs {
 		#[allow(clippy::single_match)]
 		match key.as_ref() {
 			"id" => {
-				if ctx.components_id_map.insert(value.clone(), component.weak()).is_some() {
+				if ctx.components_by_id.insert(value.clone(), component.weak()).is_some() {
 					log::warn!("duplicate component ID \"{value}\" in the same layout file!");
 				}
 			}
@@ -699,7 +729,8 @@ fn create_default_context<'a, U1, U2>(
 		templates: Default::default(),
 		macro_attribs: Default::default(),
 		components: Default::default(),
-		components_id_map: Default::default(),
+		components_by_id: Default::default(),
+		components_by_widget_id: Default::default(),
 	}
 }
 
@@ -772,7 +803,8 @@ pub fn parse_from_assets<U1, U2>(
 		macro_attribs: std::mem::take(&mut ctx.macro_attribs),
 		var_map: std::mem::take(&mut ctx.var_map),
 		components: std::mem::take(&mut ctx.components),
-		components_id_map: std::mem::take(&mut ctx.components_id_map),
+		components_by_id: std::mem::take(&mut ctx.components_by_id),
+		components_by_widget_id: std::mem::take(&mut ctx.components_by_widget_id),
 		path,
 	};