Skip to content

compute the text buffer size during layout updates #22010

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
mockersf merged 8 commits into from
Dec 7, 2025
Merged

compute the text buffer size during layout updates #22010

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2790369
Instead of calling `buffer_dimensions`, compute the text buffer size …
ickshonpe Dec 2, 2025
1a36445
ceil final size
ickshonpe Dec 2, 2025
c17a950
Merge branch 'main' into compute-text-buffer-size-during-layout
ickshonpe Dec 2, 2025
af5b820
Merge branch 'main' into compute-text-buffer-size-during-layout
ickshonpe Dec 2, 2025
33a9b43
Merge branch 'main' into compute-text-buffer-size-during-layout
ickshonpe Dec 3, 2025
3491b95
Merge branch 'main' into compute-text-buffer-size-during-layout
ickshonpe Dec 4, 2025
d552bda
Merge branch 'main' into compute-text-buffer-size-during-layout
ickshonpe Dec 6, 2025
3a184d1
update `update_text_layout_info` after merge
ickshonpe Dec 6, 2025
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
10 changes: 7 additions & 3 deletions crates/bevy_text/src/pipeline.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,9 +315,11 @@ impl TextPipeline {
}

let buffer = &mut computed.buffer;
let box_size = buffer_dimensions(buffer);
let mut box_size = Vec2::ZERO;

let result = buffer.layout_runs().try_for_each(|run| {
box_size.x = box_size.x.max(run.line_w);
box_size.y += run.line_height;
let mut current_section: Option<usize> = None;
let mut start = 0.;
let mut end = 0.;
Expand Down Expand Up @@ -443,7 +445,7 @@ impl TextPipeline {
// Check result.
result?;

layout_info.size = box_size;
layout_info.size = box_size.ceil();
Ok(())
}

Expand Down Expand Up @@ -553,9 +555,11 @@ impl TextPipeline {

let buffer = &mut computed.buffer;
buffer.set_size(font_system, bounds.width, bounds.height);
let box_size = buffer_dimensions(buffer);
let mut box_size = Vec2::ZERO;

let result = buffer.layout_runs().try_for_each(|run| {
box_size.x = box_size.x.max(run.line_w);
box_size.y += run.line_height;
let mut current_section: Option<usize> = None;
let mut start = 0.;
let mut end = 0.;
Expand Down