Skip to content

Update size and metrics after set_rich_text in TextPipeline::update_buffer #22021

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 4 commits into from
Dec 7, 2025
Merged

Update size and metrics after set_rich_text in TextPipeline::update_buffer #22021

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1668620
update size and metrics after `set_rich_text` in `TextPipeline::updat…
ickshonpe Dec 3, 2025
73143c8
Merge branch 'main' into text-pipeline-update-buffer-reordering
ickshonpe Dec 3, 2025
2bbbf3f
Merge branch 'main' into text-pipeline-update-buffer-reordering
ickshonpe Dec 4, 2025
dcddb63
Merge branch 'main' into text-pipeline-update-buffer-reordering
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: 4 additions & 6 deletions crates/bevy_text/src/pipeline.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@ impl TextPipeline {

// Update the buffer.
let buffer = &mut computed.buffer;
buffer.set_size(font_system, bounds.width, bounds.height);

buffer.set_wrap(
font_system,
Expand All @@ -213,11 +212,10 @@ impl TextPipeline {

// Workaround for alignment not working for unbounded text.
// See https://github.com/pop-os/cosmic-text/issues/343
if bounds.width.is_none() && justify != Justify::Left {
let dimensions = buffer_dimensions(buffer);
// `set_size` causes a re-layout to occur.
buffer.set_size(font_system, Some(dimensions.x), bounds.height);
}
let width = (bounds.width.is_none() && justify != Justify::Left)
.then(|| buffer_dimensions(buffer).x)
.or(bounds.width);
buffer.set_size(font_system, width, bounds.height);

// Recover the spans buffer.
spans.clear();
Expand Down