LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-26 14:10:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added DefineEditText display - letterspacing, kerning, relative font size

Browse Source
This commit is contained in:
Jindra Petřík
2023-11-05 21:11:10 +01:00
parent 7e37ec5e42
commit ac723f61b4
10 changed files with 310 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java
+25 -6
View File
@@ -438,11 +438,16 @@ public class DefineEditTextTag extends TextTag {
char firstChar = size.charAt(0);
if (firstChar != '+' && firstChar != '-') {
int fontSize = Integer.parseInt(size);
style.fontHeight = (int) Math.round(fontSize * SWF.unitDivisor);
style.fontLeading = leading;
style.fontHeight = (int) Math.round(fontSize * SWF.unitDivisor);
} else {
// todo: parse relative sizes
int fontSizeDelta = (int) Math.round(Integer.parseInt(size.substring(1)) * SWF.unitDivisor);
if (firstChar == '+') {
style.fontHeight = style.fontHeight + fontSizeDelta;
} else {
style.fontHeight = style.fontHeight - fontSizeDelta;
}
}
style.fontLeading = leading;
}
String face = unescape(attributes.getValue("face"));
@@ -455,7 +460,16 @@ public class DefineEditTextTag extends TextTag {
}
}
// todo: parse the following attributes: letterSpacing, kerning
String letterspacing = unescape(attributes.getValue("letterSpacing"));
if (letterspacing != null && letterspacing.length() > 0) {
style.letterSpacing = Double.parseDouble(letterspacing);
}
String kerning = unescape(attributes.getValue("kerning"));
if (kerning != null && kerning.length() > 0) {
style.kerning = kerning.equals("1");
}
styles.add(style);
break;
case "br":
@@ -1077,9 +1091,14 @@ public class DefineEditTextTag extends TextTag {
String fontName = ge.fontFace != null ? ge.fontFace : FontTag.getDefaultFontName();
int fontStyle = font == null ? ge.fontStyle : font.getFontStyle();
ge.glyphAdvance = ge.glyphIndex == -1 ? (int) Math.round(SWF.unitDivisor * FontTag.getSystemFontAdvance(fontName, fontStyle, (int) (lastStyle.fontHeight / SWF.unitDivisor), c, nextChar))
ge.glyphAdvance = ge.glyphIndex == -1 ? (int) Math.round(SWF.unitDivisor * FontTag.getSystemFontAdvance(fontName, fontStyle, (int) (lastStyle.fontHeight / SWF.unitDivisor), c, lastStyle.kerning ? nextChar : null))
: (int) Math.round(font.getGlyphAdvance(ge.glyphIndex) / font.getDivider() * lastStyle.fontHeight / 1024);
ge.glyphAdvance += lastStyle.letterSpacing * SWF.unitDivisor;
if (lastStyle.kerning) {
if (nextChar != null) {
ge.glyphAdvance += font.getCharKerningAdjustment(c, nextChar) / font.getDivider();
}
}
textModel.addGlyph(c, ge);
if (Character.isWhitespace(c)) {
lastWasWhiteSpace = true;
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/dynamictext/TextStyle.java
+4
View File
@@ -40,6 +40,10 @@ public final class TextStyle implements Cloneable {
public boolean underlined;
public RGBA textColor;
public double letterSpacing;
public boolean kerning;
@Override
public TextStyle clone() {