FyroxEngine/Fyrox
1
0
Fork 0
mirror of https://github.com/FyroxEngine/Fyrox.git synced 2026-10-11 22:50:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed mutex timeout crash when using text as inline widget of some text

Browse Source
This commit is contained in:
Dmitry Stepanov
2026-09-26 22:45:31 +03:00
parent 0fe64c2611
commit dd250ada8d
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fyrox-ui/src/formatted_text.rs
+20 -20
View File
@@ -1142,6 +1142,26 @@ impl FormattedText {
} else {
let mut prev = None;
for (i, &c) in self.text.iter().enumerate().take(line.end).skip(line.begin) {
// Put inlines first (if any).
if let Some(ref inline_ctx) = inline_ctx {
if let Some(inlines) = inlines.get(&i) {
let mut bounds = Vector2::zeros();
for &inline in inlines {
let inline_ref = inline_ctx.ui.node(inline);
let desired_size = inline_ref.desired_size();
inline_ctx.ui.arrange_node(
inline,
&Rect {
position: Vector2::new(x, y),
size: Vector2::new(desired_size.x, line.height),
},
);
bounds = bounds.sup(&desired_size);
}
x += bounds.x;
}
}
let font = self.font_at(i);
let font = &mut font.data_ref();
let size = self.font_size_at(i);
@@ -1151,26 +1171,6 @@ impl FormattedText {
x += metrics.newline_advance();
}
_ => {
// Put inlines first (if any).
if let Some(ref inline_ctx) = inline_ctx {
if let Some(inlines) = inlines.get(&i) {
let mut bounds = Vector2::zeros();
for &inline in inlines {
let inline_ref = inline_ctx.ui.node(inline);
let desired_size = inline_ref.desired_size();
inline_ctx.ui.arrange_node(
inline,
&Rect {
position: Vector2::new(x, y),
size: Vector2::new(desired_size.x, line.height),
},
);
bounds = bounds.sup(&desired_size);
}
x += bounds.x;
}
}
// Then the glyph.
let y1 = y + line.height - metrics.ascender();
let scale = self.super_sampling_scale;