LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-28 02:20:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

better font name handling

Browse Source 
kerning moved to FontHelper
This commit is contained in:
Jindra Petřík
2014-10-26 12:36:56 +01:00
parent bcfb4a1c01
commit 093d17a055
24 changed files with 683 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
+6 -6
View File
@@ -1950,7 +1950,7 @@ public class XFLConverter {
}
}
if (fontName == null) {
fontName = font.getFontName();
fontName = font.getFontNameIntag();
}
int fontStyle = font.getFontStyle();
String installedFont;
@@ -2451,7 +2451,7 @@ public class XFLConverter {
}
}
if ((fontName == null) && (font != null)) {
fontName = font.getFontName();
fontName = font.getFontNameIntag();
}
int fontStyle = 0;
if (font != null) {
@@ -2609,7 +2609,7 @@ public class XFLConverter {
}
if (ft != null) {
if (fontName == null) {
fontName = ft.getFontName();
fontName = ft.getFontNameIntag();
}
italic = ft.isItalic();
bold = ft.isBold();
@@ -3261,7 +3261,7 @@ public class XFLConverter {
}
if (ft != null) {
if (fontName == null) {
fontName = ft.getFontName();
fontName = ft.getFontNameIntag();
}
italic = ft.isItalic();
bold = ft.isBold();
@@ -3343,7 +3343,7 @@ public class XFLConverter {
if (tag instanceof FontTag) {
FontTag ft = (FontTag) tag;
String fontName = null;
if (f.equals(ft.getFontName())) {
if (f.equals(ft.getFontNameIntag())) {
for (Tag u : tags) {
if (u instanceof DefineFontNameTag) {
if (((DefineFontNameTag) u).fontId == ft.getFontId()) {
@@ -3352,7 +3352,7 @@ public class XFLConverter {
}
}
if (fontName == null) {
fontName = ft.getFontName();
fontName = ft.getFontNameIntag();
}
String installedFont;
if ((installedFont = FontTag.isFontFamilyInstalled(fontName)) != null) {