Fix default font fallback causing wrong caching and rename to TextContext

Author: TrueDoctor

editor/src/messages/portfolio/document/overlays/overlays_message_handler.rs

@@ -1,4 +1,4 @@
-use super::utility_types::{OverlayContext, OverlayProvider, OverlaysVisibilitySettings};
+use super::utility_types::{OverlayProvider, OverlaysVisibilitySettings};
 use crate::messages::prelude::*;
 
 #[derive(ExtractField)]
@@ -15,8 +15,8 @@ pub struct OverlaysMessageHandler {
 	canvas: Option<web_sys::HtmlCanvasElement>,
 	#[cfg(target_family = "wasm")]
 	context: Option<web_sys::CanvasRenderingContext2d>,
-	#[cfg(not(target_family = "wasm"))]
-	context: Option<OverlayContext>,
+	#[cfg(all(not(target_family = "wasm"), not(test)))]
+	context: Option<super::utility_types::OverlayContext>,
 }
 
 #[message_handler_data]

editor/src/messages/portfolio/document/overlays/utility_types_vello.rs

@@ -12,7 +12,7 @@ use graphene_std::Color;
 use graphene_std::math::quad::Quad;
 use graphene_std::subpath::{self, Subpath};
 use graphene_std::table::Table;
-use graphene_std::text::ThreadText;
+use graphene_std::text::TextContext;
 use graphene_std::text::{Font, FontCache, TextAlign, TypesettingConfig};
 use graphene_std::vector::click_target::ClickTargetType;
 use graphene_std::vector::misc::point_to_dvec2;
@@ -413,7 +413,13 @@ pub(super) struct OverlayContextInternal {
 	device_pixel_ratio: f64,
 	visibility_settings: OverlaysVisibilitySettings,
 	font_cache: FontCache,
-	thread_text: ThreadText,
+	thread_text: TextContext,
+}
+
+impl Default for OverlayContextInternal {
+	fn default() -> Self {
+		Self::new(DVec2::new(100., 100.), 1., OverlaysVisibilitySettings::default())
+	}
 }
 
 impl OverlayContextInternal {
@@ -430,7 +436,7 @@ impl OverlayContextInternal {
 			device_pixel_ratio,
 			visibility_settings,
 			font_cache,
-			thread_text: ThreadText::default(),
+			thread_text: TextContext::default(),
 		}
 	}
 

node-graph/gcore/src/text.rs

@@ -1,11 +1,11 @@
 mod font_cache;
 mod path_builder;
-mod thread_text;
+mod text_context;
 mod to_path;
 
 use dyn_any::DynAny;
 pub use font_cache::*;
-pub use thread_text::ThreadText;
+pub use text_context::TextContext;
 pub use to_path::*;
 
 /// Alignment of lines of type within a text block.

node-graph/gcore/src/text/font_cache.rs

@@ -52,13 +52,13 @@ impl FontCache {
 	}
 
 	/// Try to get the bytes for a font
-	pub fn get(&self, font: &Font) -> Option<&Vec<u8>> {
-		self.resolve_font(font).and_then(|font| self.font_file_data.get(font))
+	pub fn get<'a>(&'a self, font: &'a Font) -> Option<(&'a Vec<u8>, &'a Font)> {
+		self.resolve_font(font).and_then(|font| self.font_file_data.get(font).map(|data| (data, font)))
 	}
 
 	/// Get font data as a Blob for use with parley/skrifa
-	pub fn get_blob(&self, font: &Font) -> Option<Blob<u8>> {
-		self.get(font).map(|data| Blob::new(Arc::new(data.clone())))
+	pub fn get_blob<'a>(&'a self, font: &'a Font) -> Option<(Blob<u8>, &'a Font)> {
+		self.get(font).map(|(data, font)| (Blob::new(Arc::new(data.clone())), font))
 	}
 
 	/// Check if the font is already loaded

node-graph/gcore/src/text/thread_text.rs renamed to node-graph/gcore/src/text/text_context.rs

@@ -10,30 +10,30 @@ use std::collections::HashMap;
 use super::path_builder::PathBuilder;
 
 thread_local! {
-	static THREAD_TEXT: RefCell<ThreadText> = RefCell::new(ThreadText::default());
+	static THREAD_TEXT: RefCell<TextContext> = RefCell::new(TextContext::default());
 }
 
 /// Unified thread-local text processing context that combines font and layout management
 /// for efficient text rendering operations.
 #[derive(Default)]
-pub struct ThreadText {
+pub struct TextContext {
 	font_context: FontContext,
 	layout_context: LayoutContext<()>,
 	/// Cached font metadata for performance optimization
 	font_info_cache: HashMap<Font, (FamilyId, FontInfo)>,
 }
 
-impl ThreadText {
-	/// Access the thread-local ThreadText instance for text processing operations
-	pub fn with<F, R>(f: F) -> R
+impl TextContext {
+	/// Access the thread-local TextContext instance for text processing operations
+	pub fn with_thread_local<F, R>(f: F) -> R
 	where
-		F: FnOnce(&mut ThreadText) -> R,
+		F: FnOnce(&mut TextContext) -> R,
 	{
 		THREAD_TEXT.with_borrow_mut(f)
 	}
 
 	/// Resolve a font and return its data as a Blob if available
-	fn resolve_font_data(&self, font: &Font, font_cache: &FontCache) -> Option<Blob<u8>> {
+	fn resolve_font_data<'a>(&self, font: &'a Font, font_cache: &'a FontCache) -> Option<(Blob<u8>, &'a Font)> {
 		font_cache.get_blob(font)
 	}
 
@@ -62,8 +62,10 @@ impl ThreadText {
 
 	/// Create a text layout using the specified font and typesetting configuration
 	fn layout_text(&mut self, text: &str, font: &Font, font_cache: &FontCache, typesetting: TypesettingConfig) -> Option<Layout<()>> {
-		let font_data = self.resolve_font_data(font, font_cache)?;
-		let (font_family, font_info) = self.get_font_info(font, &font_data)?;
+		// Note that the actual_font may not be the desired font if that font is not yet loaded.
+		// It is important not to cache the default font under the name of another font.
+		let (font_data, actual_font) = self.resolve_font_data(font, font_cache)?;
+		let (font_family, font_info) = self.get_font_info(actual_font, &font_data)?;
 
 		const DISPLAY_SCALE: f32 = 1.;
 		let mut builder = self.layout_context.ranged_builder(&mut self.font_context, text, DISPLAY_SCALE, false);

node-graph/gcore/src/text/to_path.rs

@@ -1,4 +1,4 @@
-use super::thread_text::ThreadText;
+use super::text_context::TextContext;
 use super::{Font, FontCache, TypesettingConfig};
 use crate::table::Table;
 use crate::vector::Vector;
@@ -7,17 +7,17 @@ use parley::fontique::Blob;
 use std::sync::Arc;
 
 pub fn to_path(text: &str, font: &Font, font_cache: &FontCache, typesetting: TypesettingConfig, per_glyph_instances: bool) -> Table<Vector> {
-	ThreadText::with(|ctx| ctx.to_path(text, font, font_cache, typesetting, per_glyph_instances))
+	TextContext::with_thread_local(|ctx| ctx.to_path(text, font, font_cache, typesetting, per_glyph_instances))
 }
 
 pub fn bounding_box(text: &str, font: &Font, font_cache: &FontCache, typesetting: TypesettingConfig, for_clipping_test: bool) -> DVec2 {
-	ThreadText::with(|ctx| ctx.bounding_box(text, font, font_cache, typesetting, for_clipping_test))
+	TextContext::with_thread_local(|ctx| ctx.bounding_box(text, font, font_cache, typesetting, for_clipping_test))
 }
 
 pub fn load_font(data: &[u8]) -> Blob<u8> {
 	Blob::new(Arc::new(data.to_vec()))
 }
 
 pub fn lines_clipping(text: &str, font: &Font, font_cache: &FontCache, typesetting: TypesettingConfig) -> bool {
-	ThreadText::with(|ctx| ctx.lines_clipping(text, font, font_cache, typesetting))
+	TextContext::with_thread_local(|ctx| ctx.lines_clipping(text, font, font_cache, typesetting))
 }