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

Properly retrieve default font class

This commit is contained in:
David Wendt 2020-05-18 23:16:45 -04:00
parent c4e5a9afc2
commit b5de92edeb
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/html/text_format.rs
View File

@ -114,11 +114,13 @@ impl TextFormat {
swf_movie: Arc<SwfMovie>, swf_movie: Arc<SwfMovie>,
context: &mut UpdateContext<'_, 'gc, '_>, context: &mut UpdateContext<'_, 'gc, '_>,
) -> Self { ) -> Self {
let _movie_library = context.library.library_for_movie_mut(swf_movie); let movie_library = context.library.library_for_movie_mut(swf_movie);
//TODO: How do we represent fonts referenced by character rather than let font = et.font_id.and_then(|fid| movie_library.get_font(fid));
//by linkage name? let font_class = et
let font = et.font_class_name; .font_class_name
.clone()
.or_else(|| font.map(|font| font.descriptor().class().to_string()));
let align = et.layout.clone().map(|l| l.align); let align = et.layout.clone().map(|l| l.align);
let left_margin = et.layout.clone().map(|l| l.left_margin.to_pixels()); let left_margin = et.layout.clone().map(|l| l.left_margin.to_pixels());
let right_margin = et.layout.clone().map(|l| l.right_margin.to_pixels()); let right_margin = et.layout.clone().map(|l| l.right_margin.to_pixels());
@ -126,13 +128,13 @@ impl TextFormat {
let leading = et.layout.map(|l| l.leading.to_pixels()); let leading = et.layout.map(|l| l.leading.to_pixels());
Self { Self {
font, font: font_class,
size: et.height.map(|h| h.to_pixels()), size: et.height.map(|h| h.to_pixels()),
color: et.color, color: et.color,
align, align,
bold: None, // TODO: Resolve a font and pull this from that font bold: font.map(|font| font.descriptor().bold()),
italic: None, // TODO: Resolve a font and pull this from that font italic: font.map(|font| font.descriptor().italic()),
underline: None, // TODO: Resolve a font and pull this from that font underline: None, // TODO: What is this by default? False?
left_margin, left_margin,
right_margin, right_margin,
indent, indent,