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

removing frame fixed

Browse Source
This commit is contained in:
honfika
2014-05-29 23:20:10 +02:00
parent 425a550709
commit c4df6c7ace
7 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/jpexs/decompiler/flash/gui/MainPanel.java
View File

@@ -1242,11 +1242,11 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
if (!fn.scriptsNode) {
FrameNodeItem fni = (FrameNodeItem) d.getItem();
Tag par = fni.getParent();
Timelined parent = fni.getParent();
int frame = fni.getFrame() - 1; //Fix to zero based
int parentId = 0;
if (par != null) {
parentId = ((CharacterTag) par).getCharacterId();
if (parent instanceof CharacterTag) {
parentId = ((CharacterTag) parent).getCharacterId();
}
if (!frames.containsKey(parentId)) {
frames.put(parentId, new ArrayList<Integer>());
@@ -2252,9 +2252,14 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
if (tag instanceof Tag) {
tagsToRemove.add((Tag) tag);
} else if (tag instanceof FrameNodeItem) {
FrameNodeItem frame = (FrameNodeItem) tag;
// todo: honfika: remove frame
//tagsToRemove.add(frame.getShowFrameTag());
FrameNodeItem frameNode = (FrameNodeItem) tag;
Frame frame = frameNode.getParent().getTimeline().frames.get(frameNode.getFrame() - 1);
if (frame.showFrameTag != null) {
tagsToRemove.add(frame.showFrameTag);
} else {
// this should be the last frame, so remove the inner tags
tagsToRemove.addAll(frame.innerTags);
}
}
}