jess
/
Graphite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix text node thread locals not being updated (#3173)

This commit is contained in:
Salman Abuhaimed 2025-09-13 14:33:00 +03:00 committed by GitHub
parent 75ad8d4abd
commit 3cc2aa8d89
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
node-graph/gcore/src/text/to_path.rs
View File

@ -176,33 +176,32 @@ fn render_glyph_run(glyph_run: &GlyphRun<'_, ()>, path_builder: &mut PathBuilder
} }
fn layout_text(str: &str, font_data: Option<Blob<u8>>, typesetting: TypesettingConfig) -> Option<Layout<()>> { fn layout_text(str: &str, font_data: Option<Blob<u8>>, typesetting: TypesettingConfig) -> Option<Layout<()>> {
let font_cx = FONT_CONTEXT.with(Clone::clone); FONT_CONTEXT.with_borrow_mut(|mut font_cx| {
let mut font_cx = font_cx.borrow_mut(); LAYOUT_CONTEXT.with_borrow_mut(|layout_cx| {
let layout_cx = LAYOUT_CONTEXT.with(Clone::clone); let font_family = font_data.and_then(|font_data| {
let mut layout_cx = layout_cx.borrow_mut(); font_cx
.collection
.register_fonts(font_data, None)
.first()
.and_then(|(family_id, _)| font_cx.collection.family_name(*family_id).map(String::from))
})?;
let font_family = font_data.and_then(|font_data| { const DISPLAY_SCALE: f32 = 1.;
font_cx let mut builder = layout_cx.ranged_builder(&mut font_cx, str, DISPLAY_SCALE, false);
.collection
.register_fonts(font_data, None)
.first()
.and_then(|(family_id, _)| font_cx.collection.family_name(*family_id).map(String::from))
})?;
const DISPLAY_SCALE: f32 = 1.; builder.push_default(StyleProperty::FontSize(typesetting.font_size as f32));
let mut builder = layout_cx.ranged_builder(&mut font_cx, str, DISPLAY_SCALE, false); builder.push_default(StyleProperty::LetterSpacing(typesetting.character_spacing as f32));
builder.push_default(StyleProperty::FontStack(parley::FontStack::Single(parley::FontFamily::Named(std::borrow::Cow::Owned(font_family)))));
builder.push_default(LineHeight::FontSizeRelative(typesetting.line_height_ratio as f32));
builder.push_default(StyleProperty::FontSize(typesetting.font_size as f32)); let mut layout: Layout<()> = builder.build(str);
builder.push_default(StyleProperty::LetterSpacing(typesetting.character_spacing as f32));
builder.push_default(StyleProperty::FontStack(parley::FontStack::Single(parley::FontFamily::Named(std::borrow::Cow::Owned(font_family)))));
builder.push_default(LineHeight::FontSizeRelative(typesetting.line_height_ratio as f32));
let mut layout: Layout<()> = builder.build(str); layout.break_all_lines(typesetting.max_width.map(|mw| mw as f32));
layout.align(typesetting.max_width.map(|max_w| max_w as f32), typesetting.align.into(), AlignmentOptions::default());
layout.break_all_lines(typesetting.max_width.map(|mw| mw as f32)); Some(layout)
layout.align(typesetting.max_width.map(|max_w| max_w as f32), typesetting.align.into(), AlignmentOptions::default()); })
})
Some(layout)
} }
pub fn to_path(str: &str, font_data: Option<Blob<u8>>, typesetting: TypesettingConfig, per_glyph_instances: bool) -> Table<Vector> { pub fn to_path(str: &str, font_data: Option<Blob<u8>>, typesetting: TypesettingConfig, per_glyph_instances: bool) -> Table<Vector> {