Skip to content

Fix Text node/tool max width/height bounding box calculation #3628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Keavon merged 4 commits into from
Feb 14, 2026
Merged

Fix Text node/tool max width/height bounding box calculation #3628

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c9ce515
Fix: correctly apply max width/height in text bounding box
jsjgdh Jan 12, 2026
fcd4608
bug fix
jsjgdh Feb 3, 2026
3eae1e4
Code cleanup
Keavon Feb 14, 2026
7d7df6c
Merge branch 'master' into new_branch2
Keavon Feb 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions node-graph/nodes/text/src/text_context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@ impl TextContext {

for line in layout.lines() {
for item in line.items() {
if let PositionedLayoutItem::GlyphRun(glyph_run) = item {
if let PositionedLayoutItem::GlyphRun(glyph_run) = item
&& typesetting.max_height.filter(|&max_height| glyph_run.baseline() > max_height as f32).is_none()
{
path_builder.render_glyph_run(&glyph_run, typesetting.tilt, per_glyph_instances);
}
}
Expand All @@ -107,15 +109,21 @@ impl TextContext {

/// Calculate the bounding box of text using the specified font and typesetting configuration
pub fn bounding_box(&mut self, text: &str, font: &Font, font_cache: &FontCache, typesetting: TypesettingConfig, for_clipping_test: bool) -> DVec2 {
if !for_clipping_test && let (Some(max_height), Some(max_width)) = (typesetting.max_height, typesetting.max_width) {
return DVec2::new(max_width, max_height);
}

let Some(layout) = self.layout_text(text, font, font_cache, typesetting) else {
return DVec2::ZERO;
};

DVec2::new(layout.full_width() as f64, layout.height() as f64)
let layout_width = layout.full_width() as f64;
let layout_height = layout.height() as f64;

if for_clipping_test {
return DVec2::new(layout_width, layout_height);
}

let width = typesetting.max_width.unwrap_or(layout_width);
let height = typesetting.max_height.unwrap_or(layout_height);

DVec2::new(width, height)
}

/// Check if text lines are being clipped due to height constraints
Expand Down
Loading