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

avm2: Fix TLF text getting cut off vertically

This commit is contained in:
Lord-McSweeney 2023-11-10 18:43:17 -08:00 committed by Lord-McSweeney
parent 1bb2422595
commit fdb2a06ad8
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/avm2/globals/flash/text/engine/text_block.rs
View File

@ -6,7 +6,7 @@ use crate::avm2::parameters::ParametersExt;
use crate::avm2::value::Value;
use crate::avm2::Multiname;
use crate::avm2_stub_method;
use crate::display_object::EditText;
use crate::display_object::{EditText, TDisplayObject};
use crate::html::TextFormat;
use crate::string::WStr;
@ -151,5 +151,9 @@ fn apply_format<'gc>(
display_object.set_word_wrap(true, &mut activation.context);
let measured_text = display_object.measure_text(&mut activation.context);
display_object.set_height(&mut activation.context, measured_text.1.to_pixels());
Ok(())
}

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

@ -789,12 +789,6 @@ impl<'gc> EditText<'gc> {
!edit_text.flags.contains(EditTextFlag::USE_OUTLINES),
);
if edit_text.is_tlf {
// Resize the TLF textfield to match the height of the text.
// FIXME: This should probably be done in text_block::create_text_line.
edit_text.bounds.set_height(intrinsic_bounds.extent_y());
}
edit_text.line_data = get_line_data(&new_layout);
edit_text.layout = new_layout;
edit_text.intrinsic_bounds = intrinsic_bounds;