add WguiFontSystem, remove FONT_SYSTEM singleton, custom fonts, add Light font weight

there are a few gzip-compressed ttf as for now, looks like variable fonts aren't parsed properly by cosmic_text. Not sure why. Also, we probably need to have a fallback for CJK characters in the future, or just fallback to the built-in ones in the OS.

wgui/src/widget/label.rs

@@ -8,9 +8,9 @@ use crate::{
 	drawing::{self, Boundary, PrimitiveExtent},
 	event::CallbackDataCommon,
 	globals::Globals,
-	i18n::{I18n, Translation},
+	i18n::Translation,
 	layout::WidgetID,
-	renderer_vk::text::{TextStyle, FONT_SYSTEM},
+	renderer_vk::text::TextStyle,
 };
 
 use super::{WidgetObj, WidgetState};
@@ -41,7 +41,7 @@ impl WidgetLabel {
 
 		let mut buffer = Buffer::new_empty(metrics);
 		{
-			let mut font_system = FONT_SYSTEM.lock();
+			let mut font_system = globals.font_system.system.lock();
 			let mut buffer = buffer.borrow_with(&mut font_system);
 			buffer.set_wrap(wrap);
 
@@ -63,19 +63,19 @@ impl WidgetLabel {
 
 	// set text without layout/re-render update.
 	// Not recommended unless the widget wasn't rendered yet (first init).
-	pub fn set_text_simple(&mut self, i18n: &mut I18n, translation: Translation) -> bool {
+	pub fn set_text_simple(&mut self, globals: &mut Globals, translation: Translation) -> bool {
 		if self.params.content == translation {
 			return false;
 		}
 
 		self.params.content = translation;
 		let attrs = Attrs::from(&self.params.style);
-		let mut font_system = FONT_SYSTEM.lock();
+		let mut font_system = globals.font_system.system.lock();
 
 		let mut buffer = self.buffer.borrow_mut();
 		buffer.set_rich_text(
 			&mut font_system,
-			[(self.params.content.generate(i18n).as_ref(), attrs)],
+			[(self.params.content.generate(&mut globals.i18n_builtin).as_ref(), attrs)],
 			&Attrs::new(),
 			Shaping::Advanced,
 			self.params.style.align.map(Into::into),
@@ -93,7 +93,9 @@ impl WidgetLabel {
 
 	// set text and check if it needs to be re-rendered/re-layouted
 	pub fn set_text(&mut self, common: &mut CallbackDataCommon, translation: Translation) {
-		if self.set_text_simple(&mut common.i18n(), translation) {
+		let mut globals = common.state.globals.get();
+
+		if self.set_text_simple(&mut globals, translation) {
 			common.mark_widget_dirty(self.id);
 		}
 	}
@@ -113,7 +115,7 @@ impl WidgetObj for WidgetLabel {
 
 		if self.last_boundary != boundary {
 			self.last_boundary = boundary;
-			let mut font_system = FONT_SYSTEM.lock();
+			let mut font_system = state.globals.font_system.system.lock();
 			let mut buffer = self.buffer.borrow_mut();
 			buffer.set_size(&mut font_system, Some(boundary.size.x), Some(boundary.size.y));
 		}
@@ -130,6 +132,7 @@ impl WidgetObj for WidgetLabel {
 
 	fn measure(
 		&mut self,
+		globals: &Globals,
 		known_dimensions: taffy::Size<Option<f32>>,
 		available_space: taffy::Size<taffy::AvailableSpace>,
 	) -> taffy::Size<f32> {
@@ -140,7 +143,8 @@ impl WidgetObj for WidgetLabel {
 			AvailableSpace::Definite(width) => Some(width),
 		});
 
-		let mut font_system = FONT_SYSTEM.lock();
+		let wgui_font_system = &globals.font_system;
+		let mut font_system = wgui_font_system.system.lock();
 		let mut buffer = self.buffer.borrow_mut();
 
 		buffer.set_size(&mut font_system, width_constraint, None);

wgui/src/widget/mod.rs

@@ -10,6 +10,7 @@ use crate::{
 		EventListenerKind::{self, InternalStateChange, MouseLeave},
 		MouseWheelEvent,
 	},
+	globals::Globals,
 	layout::{Layout, LayoutState, WidgetID},
 	stack::{ScissorStack, TransformStack},
 };
@@ -108,6 +109,7 @@ impl WidgetState {
 
 // global draw params
 pub struct DrawState<'a> {
+	pub globals: &'a Globals,
 	pub layout: &'a Layout,
 	pub primitives: &'a mut Vec<RenderPrimitive>,
 	pub transform_stack: &'a mut TransformStack,
@@ -151,6 +153,7 @@ pub trait WidgetObj: AnyTrait {
 
 	fn measure(
 		&mut self,
+		_globals: &Globals,
 		_known_dimensions: taffy::Size<Option<f32>>,
 		_available_space: taffy::Size<taffy::AvailableSpace>,
 	) -> taffy::Size<f32> {
@@ -181,11 +184,7 @@ impl EventResult {
 
 	#[must_use]
 	pub fn merge(self, other: Self) -> Self {
-		if self > other {
-			self
-		} else {
-			other
-		}
+		if self > other { self } else { other }
 	}
 }
 

wgui/src/widget/sprite.rs

@@ -5,10 +5,11 @@ use slotmap::Key;
 
 use crate::{
 	drawing::{self, PrimitiveExtent},
+	globals::Globals,
 	layout::WidgetID,
 	renderer_vk::text::{
+		DEFAULT_METRICS,
 		custom_glyph::{CustomGlyph, CustomGlyphData},
-		DEFAULT_METRICS, FONT_SYSTEM,
 	},
 };
 
@@ -67,7 +68,7 @@ impl WidgetObj for WidgetSprite {
 			let mut buffer = Buffer::new_empty(DEFAULT_METRICS);
 
 			{
-				let mut font_system = FONT_SYSTEM.lock();
+				let mut font_system = state.globals.font_system.system.lock();
 				let mut buffer = buffer.borrow_with(&mut font_system);
 				let attrs = Attrs::new().color(Color::rgb(255, 0, 255)).weight(Weight::BOLD);
 
@@ -88,6 +89,7 @@ impl WidgetObj for WidgetSprite {
 
 	fn measure(
 		&mut self,
+		_globals: &Globals,
 		_known_dimensions: taffy::Size<Option<f32>>,
 		_available_space: taffy::Size<taffy::AvailableSpace>,
 	) -> taffy::Size<f32> {