avm2: Fix TLF text getting cut off vertically
This commit is contained in:
parent
1bb2422595
commit
fdb2a06ad8
|
@ -6,7 +6,7 @@ use crate::avm2::parameters::ParametersExt;
|
||||||
use crate::avm2::value::Value;
|
use crate::avm2::value::Value;
|
||||||
use crate::avm2::Multiname;
|
use crate::avm2::Multiname;
|
||||||
use crate::avm2_stub_method;
|
use crate::avm2_stub_method;
|
||||||
use crate::display_object::EditText;
|
use crate::display_object::{EditText, TDisplayObject};
|
||||||
use crate::html::TextFormat;
|
use crate::html::TextFormat;
|
||||||
use crate::string::WStr;
|
use crate::string::WStr;
|
||||||
|
|
||||||
|
@ -151,5 +151,9 @@ fn apply_format<'gc>(
|
||||||
|
|
||||||
display_object.set_word_wrap(true, &mut activation.context);
|
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(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
|
@ -789,12 +789,6 @@ impl<'gc> EditText<'gc> {
|
||||||
!edit_text.flags.contains(EditTextFlag::USE_OUTLINES),
|
!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.line_data = get_line_data(&new_layout);
|
||||||
edit_text.layout = new_layout;
|
edit_text.layout = new_layout;
|
||||||
edit_text.intrinsic_bounds = intrinsic_bounds;
|
edit_text.intrinsic_bounds = intrinsic_bounds;
|
||||||
|
|
Loading…
Reference in New Issue