wgui: customizable defaults

2025-09-16 18:32:56 +02:00
parent 54767d75da
commit 129785daa7
20 changed files with 82 additions and 215 deletions
--- a/wgui/src/components/button.rs
+++ b/wgui/src/components/button.rs
@@ -82,11 +82,9 @@ impl ComponentButton {
 	pub fn set_text(&self, state: &LayoutState, alterables: &mut EventAlterables, text: Translation) {
 		let globals = state.globals.clone();

-		state
-			.widgets
-			.call(self.data.id_label, |label: &mut WidgetLabel| {
-				label.set_text(&mut globals.i18n(), text);
-			});
+		state.widgets.call(self.data.id_label, |label: &mut WidgetLabel| {
+			label.set_text(&mut globals.i18n(), text);
+		});

 		alterables.mark_redraw();
 		alterables.mark_dirty(self.data.node_label);
@@ -107,9 +105,7 @@ fn anim_hover(rect: &mut WidgetRectangle, data: &Data, pos: f32, pressed: bool)

 	rect.params.color = bgcolor;
 	rect.params.color2 = get_color2(&bgcolor);
-	rect.params.border_color = data
-		.initial_border_color
-		.lerp(&data.initial_hover_border_color, mult);
+	rect.params.border_color = data.initial_border_color.lerp(&data.initial_hover_border_color, mult);
 	rect.params.border = 2.0;
 }

@@ -151,11 +147,9 @@ fn register_event_mouse_enter<U1, U2>(
 		EventListenerKind::MouseEnter,
 		Box::new(move |common, event_data, _, _| {
 			common.alterables.trigger_haptics();
-			common.alterables.animate(anim_hover_in(
-				data.clone(),
-				state.clone(),
-				event_data.widget_id,
-			));
+			common
+				.alterables
+				.animate(anim_hover_in(data.clone(), state.clone(), event_data.widget_id));
 			state.borrow_mut().hovered = true;
 			Ok(())
 		}),
@@ -174,11 +168,9 @@ fn register_event_mouse_leave<U1, U2>(
 		EventListenerKind::MouseLeave,
 		Box::new(move |common, event_data, _, _| {
 			common.alterables.trigger_haptics();
-			common.alterables.animate(anim_hover_out(
-				data.clone(),
-				state.clone(),
-				event_data.widget_id,
-			));
+			common
+				.alterables
+				.animate(anim_hover_out(data.clone(), state.clone(), event_data.widget_id));
 			state.borrow_mut().hovered = false;
 			Ok(())
 		}),
@@ -283,7 +275,7 @@ pub fn construct<U1, U2>(
 	let (id_label, node_label) = layout.add_child(
 		id_rect,
 		WidgetLabel::create(
-			&mut globals.i18n(),
+			&mut globals.get(),
 			WidgetLabelParams {
 				content: params.text,
 				style: TextStyle {
--- a/wgui/src/components/checkbox.rs
+++ b/wgui/src/components/checkbox.rs
@@ -80,11 +80,7 @@ const COLOR_UNCHECKED: Color = Color::new(0.1, 0.5, 1.0, 0.0);

 fn set_box_checked(widgets: &layout::WidgetMap, data: &Data, checked: bool) {
 	widgets.call(data.id_inner_box, |rect: &mut WidgetRectangle| {
-		rect.params.color = if checked {
-			COLOR_CHECKED
-		} else {
-			COLOR_UNCHECKED
-		}
+		rect.params.color = if checked { COLOR_CHECKED } else { COLOR_UNCHECKED }
 	});
 }

@@ -92,11 +88,9 @@ impl ComponentCheckbox {
 	pub fn set_text(&self, state: &LayoutState, alterables: &mut EventAlterables, text: Translation) {
 		let globals = state.globals.clone();

-		state
-			.widgets
-			.call(self.data.id_label, |label: &mut WidgetLabel| {
-				label.set_text(&mut globals.i18n(), text);
-			});
+		state.widgets.call(self.data.id_label, |label: &mut WidgetLabel| {
+			label.set_text(&mut globals.i18n(), text);
+		});

 		alterables.mark_redraw();
 		alterables.mark_dirty(self.data.node_label);
@@ -321,11 +315,7 @@ pub fn construct<U1, U2>(
 		id_outer_box,
 		WidgetRectangle::create(WidgetRectangleParams {
 			round: WLength::Units(5.0),
-			color: if params.checked {
-				COLOR_CHECKED
-			} else {
-				COLOR_UNCHECKED
-			},
+			color: if params.checked { COLOR_CHECKED } else { COLOR_UNCHECKED },
 			..Default::default()
 		}),
 		taffy::Style {
@@ -340,7 +330,7 @@ pub fn construct<U1, U2>(
 	let (id_label, node_label) = layout.add_child(
 		id_container,
 		WidgetLabel::create(
-			&mut globals.i18n(),
+			&mut globals.get(),
 			WidgetLabelParams {
 				content: params.text,
 				style: TextStyle {
--- a/wgui/src/components/slider.rs
+++ b/wgui/src/components/slider.rs
@@ -7,10 +7,7 @@ use crate::{
 	animation::{Animation, AnimationEasing},
 	components::{Component, ComponentBase, ComponentTrait, InitData},
 	drawing::{self},
-	event::{
-		self, CallbackDataCommon, EventAlterables, EventListenerCollection, EventListenerKind,
-		ListenerHandleVec,
-	},
+	event::{self, CallbackDataCommon, EventAlterables, EventListenerCollection, EventListenerKind, ListenerHandleVec},
 	i18n::{I18n, Translation},
 	layout::{Layout, LayoutState, WidgetID},
 	renderer_vk::{
@@ -133,19 +130,10 @@ impl State {

 	fn update_text(i18n: &mut I18n, text: &mut WidgetLabel, value: f32) {
 		// round displayed value, should be sufficient for now
-		text.set_text(
-			i18n,
-			Translation::from_raw_text(&format!("{}", value.round())),
-		);
+		text.set_text(i18n, Translation::from_raw_text(&format!("{}", value.round())));
 	}

-	fn set_value(
-		&mut self,
-		state: &LayoutState,
-		data: &Data,
-		alterables: &mut EventAlterables,
-		value: f32,
-	) {
+	fn set_value(&mut self, state: &LayoutState, data: &Data, alterables: &mut EventAlterables, value: f32) {
 		//common.call_on_widget(data.slider_handle_id, |_div: &mut Div| {});
 		self.values.value = value;
 		let mut style = state.tree.style(data.slider_handle_node).unwrap().clone();
@@ -153,11 +141,9 @@ impl State {
 		alterables.mark_dirty(data.slider_handle_node);
 		alterables.mark_redraw();
 		alterables.set_style(data.slider_handle_node, style);
-		state
-			.widgets
-			.call(data.slider_text_id, |label: &mut WidgetLabel| {
-				Self::update_text(&mut state.globals.i18n(), label, value);
-			});
+		state.widgets.call(data.slider_text_id, |label: &mut WidgetLabel| {
+			Self::update_text(&mut state.globals.i18n(), label, value);
+		});
 	}
 }

@@ -178,8 +164,7 @@ fn get_anim_transform(pos: f32, widget_size: Vec2) -> Mat4 {

 fn anim_rect(rect: &mut WidgetRectangle, pos: f32) {
 	rect.params.color = drawing::Color::lerp(&HANDLE_COLOR, &HANDLE_COLOR_HOVERED, pos);
-	rect.params.border_color =
-		drawing::Color::lerp(&HANDLE_BORDER_COLOR, &HANDLE_BORDER_COLOR_HOVERED, pos);
+	rect.params.border_color = drawing::Color::lerp(&HANDLE_BORDER_COLOR, &HANDLE_BORDER_COLOR_HOVERED, pos);
 }

 fn on_enter_anim(common: &mut event::CallbackDataCommon, handle_id: WidgetID) {
@@ -364,8 +349,7 @@ pub fn construct<U1, U2>(
 	};

 	// invisible outer handle body
-	let (slider_handle_id, slider_handle_node) =
-		layout.add_child(body_id, WidgetDiv::create(), slider_handle_style)?;
+	let (slider_handle_id, slider_handle_node) = layout.add_child(body_id, WidgetDiv::create(), slider_handle_style)?;

 	let (slider_handle_rect_id, _) = layout.add_child(
 		slider_handle_id,
@@ -393,12 +377,11 @@ pub fn construct<U1, U2>(
 	};

 	let globals = layout.state.globals.clone();
-	let mut i18n = globals.i18n();

 	let (slider_text_id, _) = layout.add_child(
 		slider_handle_id,
 		WidgetLabel::create(
-			&mut i18n,
+			&mut globals.get(),
 			WidgetLabelParams {
 				content: Translation::default(),
 				style: TextStyle {