You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pi...@apache.org on 2017/08/13 22:04:27 UTC
[34/42] git commit: [flex-asjs] [refs/heads/feature/amf] - guess at a
size if no fontloader
guess at a size if no fontloader
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/3bb3f41a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3bb3f41a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3bb3f41a
Branch: refs/heads/feature/amf
Commit: 3bb3f41a1f05e68c7caad86204a3b10c02dc6678
Parents: 9decbb6
Author: Alex Harui <ah...@apache.org>
Authored: Tue Aug 8 09:59:38 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Aug 8 10:01:16 2017 -0700
----------------------------------------------------------------------
.../flex/org/apache/flex/text/engine/ElementFormat.as | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3bb3f41a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as
index 00a5c82..47e9bb2 100644
--- a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as
+++ b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as
@@ -86,7 +86,15 @@ package org.apache.flex.text.engine
public function getFontMetrics():FontMetrics
{
assert(fontDescription != null,"fontDescription not assigned!");
- return fontDescription.fontLoader.getFont(fontDescription.fontName,fontDescription.fontStyle).fontMetrics.clone();
+ if (fontDescription.fontLoader)
+ return fontDescription.fontLoader.getFont(fontDescription.fontName,fontDescription.fontStyle).fontMetrics.clone();
+ else
+ {
+ var fm:FontMetrics = new FontMetrics();
+ // just a guess for now
+ fm.emBox = new Rectangle(0, 1.2 - fontSize, fontSize, 1.2);
+ return fm;
+ }
}
}
}
\ No newline at end of file