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

Issue #395 Fixed adding characters to GFx fonts

Browse Source 
No to all fix (Adding characters when exists)
This commit is contained in:
Jindra Pet��k
2013-09-23 20:57:17 +02:00
parent 691e91bbe4
commit ec4418c987
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java
+2 -1
View File
@@ -2315,7 +2315,8 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
if (opt == 3) {
notoall = true;
}
} else if (yestoall) {
}
if (yestoall) {
opt = 0; //yes
} else if (notoall) {
opt = 1; //no
trunk/src/com/jpexs/decompiler/flash/tags/GFxDefineCompactedFont.java
+18 -6
View File
@@ -105,7 +105,7 @@ public class GFxDefineCompactedFont extends FontTag implements DrawableTag {
* @return Bytes of data
*/
@Override
public byte[] getData(int version) {
public byte[] getData(int version) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
OutputStream os = baos;
SWFOutputStream sos = new SWFOutputStream(os, version);
@@ -205,8 +205,12 @@ public class GFxDefineCompactedFont extends FontTag implements DrawableTag {
int code = (int) character;
int pos = -1;
boolean exists = false;
for (int i = 0; i < font.glyphInfo.size(); i++) {
if (font.glyphInfo.get(i).glyphCode > code) {
if (font.glyphInfo.get(i).glyphCode >= code) {
if (font.glyphInfo.get(i).glyphCode == code) {
exists = true;
}
pos = i;
break;
}
@@ -215,13 +219,21 @@ public class GFxDefineCompactedFont extends FontTag implements DrawableTag {
pos = font.glyphInfo.size();
}
FontTag.shiftGlyphIndices(fontId, pos, tags);
if (!exists) {
FontTag.shiftGlyphIndices(fontId, pos, tags);
}
Font fnt = new Font(fontName, fontStyle, 20 * font.nominalSize);
int advance = (int) Math.round(fnt.createGlyphVector((new JPanel()).getFontMetrics(fnt).getFontRenderContext(), "" + character).getGlyphMetrics(0).getAdvanceX());
font.glyphInfo.add(pos, new GlyphInfoType(code, advance, 0));
font.glyphs.add(pos, new GlyphType(shp.shapeRecords));
shapeCache.add(pos, font.glyphs.get(pos).toSHAPE());
if (!exists) {
font.glyphInfo.add(pos, new GlyphInfoType(code, advance, 0));
font.glyphs.add(pos, new GlyphType(shp.shapeRecords));
shapeCache.add(pos, font.glyphs.get(pos).toSHAPE());
} else {
font.glyphInfo.set(pos, new GlyphInfoType(code, advance, 0));
font.glyphs.set(pos, new GlyphType(shp.shapeRecords));
shapeCache.set(pos, font.glyphs.get(pos).toSHAPE());
}
imageCache.remove("font" + fontId);
}