LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-28 13:45:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge origin/master

Browse Source
This commit is contained in:
Jindra Petřík
2015-12-06 06:29:26 +01:00
parent 0724b4a3f0 932cd11d7e
commit 167f4e9c4f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,7 +134,7 @@ public class DefineEditTextTag extends TextTag {
public String fontClass;
@SWFType(BasicType.UI16)
@Conditional("hasFont")
@Conditional("hasFont|hasFontClass")
public int fontHeight;
@Conditional("hasTextColor")
@@ -219,7 +219,8 @@ public class DefineEditTextTag extends TextTag {
if (hasFontClass) {
fontClass = sis.readString("fontClass");
}
if (hasFont) {
// condition is wrong in the documentation
if (hasFont || hasFontClass) {
fontHeight = sis.readUI16("fontHeight");
}
if (hasTextColor) {
@@ -274,7 +275,7 @@ public class DefineEditTextTag extends TextTag {
if (hasFontClass) {
sos.writeString(fontClass);
}
if (hasFont) {
if (hasFont || hasFontClass) {
sos.writeUI16(fontHeight);
}
if (hasTextColor) {