working bar context menus + kbd downsize

wgui/assets/wgui/context_menu.xml

@@ -1,7 +1,7 @@
 <layout>
   <!-- text: str -->
   <template name="Cell">
-    <Button id="button" text="${text}" weight="bold" border="0" color="#FFFFFF00" />
+    <Button id="button" text="${text}" weight="bold" border="0" padding="4" color="#FFFFFF00" />
   </template>
 
   <template name="Separator">
@@ -13,4 +13,4 @@
 
     </rectangle>
   </elements>
-</layout>
+</layout>

wgui/src/parser/mod.rs

@@ -32,7 +32,6 @@ use crate::{
 	windowing::context_menu,
 };
 use anyhow::Context;
-use glam::Vec2;
 use ouroboros::self_referencing;
 use smallvec::SmallVec;
 use std::{cell::RefMut, collections::HashMap, path::Path, rc::Rc};
@@ -97,7 +96,7 @@ pub trait Fetchable {
 }
 
 impl ParserData {
-	fn take_results_from(&mut self, from: &mut Self) {
+	pub(crate) fn take_results_from(&mut self, from: &mut Self) {
 		let ids = std::mem::take(&mut from.ids);
 		let components = std::mem::take(&mut from.components);
 		let components_by_id = std::mem::take(&mut from.components_by_id);
@@ -140,7 +139,7 @@ impl Fetchable for ParserData {
 		};
 
 		let Some(component) = weak.upgrade() else {
-			anyhow::bail!("Component by widget ID \"{widget_id:?}\" doesn't exist");
+			anyhow::bail!("Component by widget ID \"{widget_id:?}\" has disappeared");
 		};
 
 		Ok(Component(component))
@@ -264,7 +263,6 @@ impl ParserState {
 		&mut self,
 		template_name: &str,
 		template_params: &HashMap<Rc<str>, Rc<str>>,
-		position: Vec2,
 	) -> anyhow::Result<context_menu::Blueprint> {
 		let Some(template) = self.data.templates.get(template_name) else {
 			anyhow::bail!("no template named \"{template_name}\" found");
@@ -320,7 +318,6 @@ impl ParserState {
 		Ok(
 			context_menu::Blueprint {
 				cells,
-				position,
 			}
 		)
 	}

wgui/src/renderer_vk/text/mod.rs

@@ -16,7 +16,7 @@ use crate::drawing::{self};
 pub static SWASH_CACHE: LazyLock<Mutex<SwashCache>> = LazyLock::new(|| Mutex::new(SwashCache::new()));
 
 /// Used in case no `font_size` is defined
-const DEFAULT_FONT_SIZE: f32 = 14.;
+pub(crate) const DEFAULT_FONT_SIZE: f32 = 14.;
 
 /// In case no `line_height` is defined, use `font_size` * `DEFAULT_LINE_HEIGHT_RATIO`
 const DEFAULT_LINE_HEIGHT_RATIO: f32 = 1.43;
@@ -77,7 +77,11 @@ impl From<&TextStyle> for Metrics {
 
 impl From<&TextStyle> for Wrap {
 	fn from(value: &TextStyle) -> Self {
-		if value.wrap { Self::WordOrGlyph } else { Self::None }
+		if value.wrap {
+			Self::WordOrGlyph
+		} else {
+			Self::None
+		}
 	}
 }
 

wgui/src/windowing/context_menu.rs

@@ -20,7 +20,6 @@ pub struct Cell {
 }
 
 pub(crate) struct Blueprint {
-	pub position: Vec2,
 	pub cells: Vec<Cell>,
 }
 
@@ -43,23 +42,25 @@ pub struct ContextMenu {
 	tasks: Tasks<Task>,
 }
 
-fn doc_params<'a>(
-	globals: &WguiGlobals,
-	on_custom_attribs: Option<parser::OnCustomAttribsFunc>,
-) -> parser::ParseDocumentParams<'a> {
+fn doc_params<'a>(globals: &WguiGlobals) -> parser::ParseDocumentParams<'a> {
 	parser::ParseDocumentParams {
 		globals: globals.clone(),
 		path: AssetPath::WguiInternal("wgui/context_menu.xml"),
-		extra: parser::ParseDocumentExtra {
-			on_custom_attribs,
-			..Default::default()
-		},
+		extra: Default::default(),
 	}
 }
 
 #[derive(Default)]
-pub struct TickResult {
-	pub action_name: Option<Rc<str>>,
+pub enum TickResult {
+	/// Nothing happened
+	#[default]
+	None,
+	/// The context menu was opened.
+	Opened,
+	/// User has selected an action.
+	Action(Rc<str>),
+	/// The context menu was closed without an action.
+	Closed,
 }
 
 impl ContextMenu {
@@ -77,8 +78,7 @@ impl ContextMenu {
 		layout: &mut Layout,
 		parser_state: &mut ParserState,
 	) -> anyhow::Result<()> {
-		let blueprint =
-			parser_state.context_menu_create_blueprint(&params.template_name, &params.template_params, params.position)?;
+		let blueprint = parser_state.context_menu_create_blueprint(&params.template_name, &params.template_params)?;
 
 		let globals = layout.state.globals.clone();
 
@@ -94,19 +94,20 @@ impl ContextMenu {
 		})?;
 
 		let content = self.window.get_content();
-		let doc_params = doc_params(&globals, params.on_custom_attribs.clone());
+		let doc_params = doc_params(&globals);
 
-		let mut state = parser::parse_from_assets(&doc_params, layout, content.id)?;
+		let mut inner_parser = parser::parse_from_assets(&doc_params, layout, content.id)?;
 
-		let id_buttons = state.get_widget_id("buttons")?;
+		let id_buttons = inner_parser.get_widget_id("buttons")?;
 
 		for (idx, cell) in blueprint.cells.iter().enumerate() {
 			let mut par = HashMap::new();
 			par.insert(Rc::from("text"), cell.title.generate(&mut globals.i18n()));
-			let data_cell = state.parse_template(&doc_params, "Cell", layout, id_buttons, par)?;
+			let mut data_cell = inner_parser.parse_template(&doc_params, "Cell", layout, id_buttons, par)?;
 
 			let button = data_cell.fetch_component_as::<ComponentButton>("button")?;
 			let button_id = button.base().get_id();
+			parser_state.data.take_results_from(&mut data_cell);
 			self
 				.tasks
 				.handle_button(&button, Task::ActionClicked(cell.action_name.clone()));
@@ -121,7 +122,7 @@ impl ContextMenu {
 			}
 
 			if idx < blueprint.cells.len() - 1 {
-				state.parse_template(&doc_params, "Separator", layout, id_buttons, Default::default())?;
+				inner_parser.parse_template(&doc_params, "Separator", layout, id_buttons, Default::default())?;
 			}
 		}
 		Ok(())
@@ -130,14 +131,20 @@ impl ContextMenu {
 	pub fn tick(&mut self, layout: &mut Layout, parser_state: &mut ParserState) -> anyhow::Result<TickResult> {
 		if let Some(mut p) = self.pending_open.take() {
 			self.open_process(&mut p, layout, parser_state)?;
+			let _ = self.tasks.drain();
+			return Ok(TickResult::Opened);
 		}
 
 		let mut result = TickResult::default();
 
 		for task in self.tasks.drain() {
 			match task {
-				Task::ActionClicked(action_name) => {
-					result.action_name = action_name;
+				Task::ActionClicked(Some(action_name)) => {
+					result = TickResult::Action(action_name);
+					self.close();
+				}
+				Task::ActionClicked(None) => {
+					result = TickResult::Closed;
 					self.close();
 				}
 			}

wgui/src/windowing/window.rs

@@ -14,10 +14,10 @@ use crate::{
 	layout::{Layout, LayoutTask, LayoutTasks, WidgetPair},
 	parser::{self, Fetchable, ParserState},
 	widget::{
-		EventResult,
 		div::WidgetDiv,
 		label::WidgetLabel,
 		rectangle::{WidgetRectangle, WidgetRectangleParams},
+		EventResult,
 	},
 };