zoom fix, font paging fix

This commit is contained in:
honfika@gmail.com
2015-04-28 15:11:22 +02:00
parent 14d1020292
commit ba6b75371e
6 changed files with 52 additions and 37 deletions

View File

@@ -2381,7 +2381,14 @@ public final class SWF implements SWFContainerItem, Timelined {
if (drawableFrameCount == 0) {
drawableFrameCount = 1;
}
int dframe = (time + layer.time) % drawableFrameCount;
int dframe;
if (timeline.fontFrameNum != -1) {
dframe = timeline.fontFrameNum;
} else {
dframe = (time + layer.time) % drawableFrameCount;
}
if (character instanceof ButtonTag) {
dframe = ButtonTag.FRAME_UP;
if (renderContext.stateUnderCursor == layer) {

View File

@@ -52,7 +52,7 @@ import java.util.List;
*
* @author JPEXS
*/
public final class DefineCompactedFont extends FontTag implements DrawableTag {
public final class DefineCompactedFont extends FontTag {
public static final int ID = 1005;

View File

@@ -71,6 +71,8 @@ public class Timeline {
public int maxDepth;
public int fontFrameNum = -1;
public List<Tag> tags;
private final List<Frame> frames = new ArrayList<>();