liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: Fix incorrect rendering of word-wrap text boxes (close #1095)

This commit is contained in:
Roman Rogowski 2022-08-22 16:32:55 -04:00 committed by Mike Welsh
parent b5391c00f6
commit 66d144bbdd
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/display_object/edit_text.rs
View File

@ -789,21 +789,25 @@ impl<'gc> EditText<'gc> {
edit_text.scroll = 1;
if autosize != AutoSizeMode::None {
// The edit text's bounds needs to have the padding baked in.
let width = intrinsic_bounds.width() + padding;
let height = intrinsic_bounds.height() + padding;
let new_x = match autosize {
AutoSizeMode::Left => edit_text.bounds.x_min,
AutoSizeMode::Center => {
(edit_text.bounds.x_min + edit_text.bounds.x_max - width) / 2
}
AutoSizeMode::Right => edit_text.bounds.x_max - width,
AutoSizeMode::None => unreachable!(),
};
if !is_word_wrap {
// The edit text's bounds needs to have the padding baked in.
let width = intrinsic_bounds.width() + padding;
let new_x = match autosize {
AutoSizeMode::Left => edit_text.bounds.x_min,
AutoSizeMode::Center => {
(edit_text.bounds.x_min + edit_text.bounds.x_max - width) / 2
}
AutoSizeMode::Right => edit_text.bounds.x_max - width,
AutoSizeMode::None => unreachable!(),
};
edit_text.bounds.set_x(new_x);
edit_text.bounds.set_width(width);
} else {
let width = edit_text.static_data.text.bounds.x_max
- edit_text.static_data.text.bounds.x_min;
edit_text.bounds.set_width(width);
}
let height = intrinsic_bounds.height() + padding;
edit_text.bounds.set_height(height);
drop(edit_text);
self.redraw_border(context.gc_context);