LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-19 04:41:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #1748 Wrong matching of DefineEditText fonts for rendering

Browse Source
This commit is contained in:
Jindra Petřík
2021-11-15 19:12:43 +01:00
parent 4a41d97553
commit a342bf7c78
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
View File

@@ -584,6 +584,20 @@ public final class SWF implements SWFContainerItem, Timelined {
return null;
}
public FontTag getFontByNameInTag(String fontName) {
if (fontName == null) {
return null;
}
for (Tag t : getTags()) {
if (t instanceof FontTag) {
if (fontName.equals(((FontTag) t).getFontNameIntag())) {
return (FontTag) t;
}
}
}
return null;
}
public FontTag getFont(int fontId) {
CharacterTag characterTag = getCharacters().get(fontId);
if (characterTag instanceof FontTag) {

11
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java
View File

@@ -440,7 +440,7 @@ public class DefineEditTextTag extends TextTag {
{
if (face != null && face.length() > 0) {
style.fontFace = face;
FontTag insideFont = swf.getFontByName(face);
FontTag insideFont = swf.getFontByNameInTag(face);
style.font = insideFont;
if (insideFont != null) {
style.fontFace = null;
@@ -1043,11 +1043,16 @@ public class DefineEditTextTag extends TextTag {
ge.fontStyle = (lastStyle.bold ? Font.BOLD : 0) | (lastStyle.italic ? Font.ITALIC : 0);
ge.character = c;
ge.glyphIndex = -1; // always use system character glyphs in edit text
if (font != null) {
ge.glyphIndex = font.charToGlyph(c);
} else {
ge.glyphIndex = -1;
}
String fontName = ge.fontFace != null ? ge.fontFace : FontTag.getDefaultFontName();
int fontStyle = font == null ? ge.fontStyle : font.getFontStyle();
ge.glyphAdvance = (int) Math.round(SWF.unitDivisor * FontTag.getSystemFontAdvance(fontName, fontStyle, (int) (lastStyle.fontHeight / SWF.unitDivisor), c, nextChar));
ge.glyphAdvance = font == null ? (int) Math.round(SWF.unitDivisor * FontTag.getSystemFontAdvance(fontName, fontStyle, (int) (lastStyle.fontHeight / SWF.unitDivisor), c, nextChar))
: (int) (font.getGlyphAdvance(ge.glyphIndex) / font.getDivider());
textModel.addGlyph(c, ge);
if (Character.isWhitespace(c)) {