LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-10 01:14:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set advance values correctly when font does not support the character

Browse Source
This commit is contained in:
Jindra Petřík
2016-09-17 17:35:11 +02:00
parent 51f4608d1a
commit 42eda53a62
2 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java
View File

@@ -527,25 +527,26 @@ public class DefineFont2Tag extends FontTag {
@Override
public void setAdvanceValues(Font font) {
boolean hasLayout = fontFlagsHasLayout;
fontFlagsHasLayout = true;
fontAdvanceTable = new ArrayList<>();
if (!hasLayout) {
fontBoundsTable = new ArrayList<>();
fontKerningTable = new ArrayList<>();
}
for (Integer character : codeTable) {
List<RECT> newFontBoundsTable = new ArrayList<>();
List<Integer> newFontAdvanceTable = new ArrayList<>();
for (int i = 0; i < codeTable.size(); i++) {
Integer character = codeTable.get(i);
char ch = (char) (int) character;
if (!font.canDisplay(ch)) {
if (!font.canDisplay(ch) && fontFlagsHasLayout) { //cannot display, leave old if exist
newFontAdvanceTable.add(fontAdvanceTable.get(i));
newFontBoundsTable.add(fontBoundsTable.get(i));
continue;
}
SHAPE shp = SHAPERECORD.fontCharacterToSHAPE(font, (int) Math.round(getDivider() * 1024), ch);
fontBoundsTable.add(shp.getBounds());
newFontBoundsTable.add(shp.getBounds());
int fontStyle = getFontStyle();
Font advanceFont = font.deriveFont(fontStyle, 1024); // Not multiplied with divider as it causes problems to create font with height around 20k
fontAdvanceTable.add((int) getDivider() * Math.round(FontHelper.getFontAdvance(advanceFont, ch)));
newFontAdvanceTable.add((int) getDivider() * Math.round(FontHelper.getFontAdvance(advanceFont, ch)));
}
fontAdvanceTable = newFontAdvanceTable;
fontBoundsTable = newFontBoundsTable;
fontKerningTable = new ArrayList<>();
fontFlagsHasLayout = true;
}
@Override

25
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java
View File

@@ -532,25 +532,26 @@ public class DefineFont3Tag extends FontTag {
@Override
public void setAdvanceValues(Font font) {
boolean hasLayout = fontFlagsHasLayout;
fontFlagsHasLayout = true;
fontAdvanceTable = new ArrayList<>();
if (!hasLayout) {
fontBoundsTable = new ArrayList<>();
fontKerningTable = new ArrayList<>();
}
for (Integer character : codeTable) {
List<RECT> newFontBoundsTable = new ArrayList<>();
List<Integer> newFontAdvanceTable = new ArrayList<>();
for (int i = 0; i < codeTable.size(); i++) {
Integer character = codeTable.get(i);
char ch = (char) (int) character;
if (!font.canDisplay(ch)) {
if (!font.canDisplay(ch) && fontFlagsHasLayout) { //cannot display, leave old if exist
newFontAdvanceTable.add(fontAdvanceTable.get(i));
newFontBoundsTable.add(fontBoundsTable.get(i));
continue;
}
SHAPE shp = SHAPERECORD.fontCharacterToSHAPE(font, (int) Math.round(getDivider() * 1024), ch);
fontBoundsTable.add(shp.getBounds());
newFontBoundsTable.add(shp.getBounds());
int fontStyle = getFontStyle();
Font advanceFont = font.deriveFont(fontStyle, 1024); // Not multiplied with divider as it causes problems to create font with height around 20k
fontAdvanceTable.add((int) getDivider() * Math.round(FontHelper.getFontAdvance(advanceFont, ch)));
newFontAdvanceTable.add((int) getDivider() * Math.round(FontHelper.getFontAdvance(advanceFont, ch)));
}
fontAdvanceTable = newFontAdvanceTable;
fontBoundsTable = newFontBoundsTable;
fontKerningTable = new ArrayList<>();
fontFlagsHasLayout = true;
}
@Override