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

Add to stage tag order fix.

Browse Source
This commit is contained in:
Jindra Petřík
2024-10-29 16:55:43 +01:00
parent 3dd6e6fad8
commit 875b9c17d3
9 changed files with 146 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/jpexs/decompiler/flash/easygui/MainFrame.java
+35 -1
View File
@@ -16,6 +16,8 @@
*/
package com.jpexs.decompiler.flash.easygui;
import com.jpexs.decompiler.flash.DefineBeforeUsageFixer;
import com.jpexs.decompiler.flash.ReadOnlyTagList;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.gui.ImagePanel;
import com.jpexs.decompiler.flash.gui.RegistrationPointPosition;
@@ -47,6 +49,7 @@ import java.awt.geom.Point2D;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.List;
import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JPanel;
@@ -183,14 +186,18 @@ public class MainFrame extends JFrame {
private PlaceObject2Tag place;
private RemoveObject2Tag remove;
private List<Tag> tags;
private int frame = stagePanel.getFrame();
private int depth = stagePanel.getSelectedDepth();
@Override
public void doOperation() {
timelinePanel.setFrame(frame, depth);
CharacterTag ch = (CharacterTag) tag;
int maxDepth = stagePanel.getTimelined().getTimeline().getMaxDepth();
int newDepth = maxDepth + 1;
Timelined timelined = stagePanel.getTimelined();
ShowFrameTag showFrameTag = timelined.getTimeline().getFrame(stagePanel.getFrame()).showFrameTag;
ShowFrameTag showFrameTag = timelined.getTimeline().getFrame(frame).showFrameTag;
place = new PlaceObject2Tag(timelined.getSwf());
place.depth = newDepth;
place.placeFlagHasCharacter = true;
@@ -207,6 +214,14 @@ public class MainFrame extends JFrame {
remove.depth = newDepth;
timelined.addTag(timelined.indexOfTag(showFrameTag) + 1, remove);
}
tags = timelined.getSwf().getTags().toArrayList();
DefineBeforeUsageFixer fixer = new DefineBeforeUsageFixer();
boolean tagOrderChanged = fixer.fixDefineBeforeUsage(timelined.getSwf());
if (!tagOrderChanged) {
tags = null;
}
timelined.resetTimeline();
stagePanel.repaint();
timelinePanel.refresh();
@@ -221,8 +236,27 @@ public class MainFrame extends JFrame {
timelined.removeTag(remove);
}
timelined.resetTimeline();
//Tag order changed, put the original tags back
if (tags != null) {
SWF swf = timelined.getSwf();
ReadOnlyTagList newTags = swf.getTags();
int size = newTags.size();
for (int i = 0; i < size; i++) {
swf.removeTag(0);
}
for (int i = 0; i < tags.size(); i++) {
if (tags.get(i) == place) {
continue;
}
swf.addTag(tags.get(i));
}
swf.resetTimeline();
}
stagePanel.repaint();
timelinePanel.refresh();
timelinePanel.setFrame(frame, depth);
}
@Override
src/com/jpexs/decompiler/flash/gui/ImagePanel.java
+4 -3
View File
@@ -1144,13 +1144,14 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
if (altDown || selectionMode) {
if (depthStateUnderCursor != null) {
if (transformSelectionMode) {
if (freeTransformDepth != depthStateUnderCursor.depth) {
if (freeTransformDepth != depthStateUnderCursor.depth && mode == Cursor.DEFAULT_CURSOR) {
freeTransformDepth(depthStateUnderCursor.depth);
firePlaceObjectSelected();
}
} else if (selectionMode) {
selectDepth(depthStateUnderCursor.depth);
}
firePlaceObjectSelected();
firePlaceObjectSelected();
}
}
if (!selectionMode) {
return;
src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java
+3 -1
View File
@@ -91,6 +91,7 @@ import com.jpexs.decompiler.flash.tags.SymbolClassTag;
import com.jpexs.decompiler.flash.tags.Tag;
import com.jpexs.decompiler.flash.tags.TagTypeInfo;
import com.jpexs.decompiler.flash.tags.UnknownTag;
import com.jpexs.decompiler.flash.tags.VideoFrameTag;
import com.jpexs.decompiler.flash.tags.base.ASMSource;
import com.jpexs.decompiler.flash.tags.base.BinaryDataInterface;
import com.jpexs.decompiler.flash.tags.base.ButtonTag;
@@ -5281,7 +5282,8 @@ public class TagTreeContextMenu extends JPopupMenu {
Tag t2 = swf.getTags().get(j);
if ((t2 instanceof CharacterIdTag)
&& !(t2 instanceof PlaceObjectTypeTag)
&& !(t2 instanceof RemoveTag)) {
&& !(t2 instanceof RemoveTag)
&& !(t2 instanceof VideoFrameTag)) {
CharacterIdTag chit = (CharacterIdTag) t2;
if (chit.getCharacterId() == characterId) {
swf.removeTag(j);