Skip to content

Fix: correctly applied max width/height in text bounding box #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

Open
jsjgdh wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −5
Open

Fix: correctly applied max width/height in text bounding box #3628

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 13 additions & 5 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 @@ -107,15 +107,23 @@ 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;

// For clipping tests use of the actual layout dimensions to see if text overflows
if for_clipping_test {
return DVec2::new(layout_width, layout_height);
}

// max_width/max_height used if set ,otherwise fall back to calculated layout dimensions
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