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

DefineButton preview fix

Browse Source
This commit is contained in:
[email protected]
2014-12-16 19:37:31 +01:00
parent 0392698c33
commit 0c37282c18
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/jpexs/decompiler/flash/gui/ImagePanel.java
+3 -2
View File
@@ -705,7 +705,8 @@ public final class ImagePanel extends JPanel implements ActionListener, MediaDis
pause();
if (timelined != null) {
timer = new Timer();
int frameRate = 1000 / timelined.getTimeline().frameRate;
int frameRate = timelined.getTimeline().frameRate;
int framesPerSec = frameRate == 0 ? 0 : 1000 / frameRate;
timer.schedule(new TimerTask() {
boolean first = true;
@@ -727,7 +728,7 @@ public final class ImagePanel extends JPanel implements ActionListener, MediaDis
}
}
}
}, 0, frameRate == 0 ? Integer.MAX_VALUE : frameRate);
}, 0, framesPerSec == 0 ? Integer.MAX_VALUE : framesPerSec);
}
}
src/com/jpexs/decompiler/flash/gui/MainPanel.java
+10 -6
View File
@@ -2141,8 +2141,10 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
// show the preview of the tag when the user clicks to the tagname inside the scripts node, too
// this is a little bit inconsistent, beacuse the frames (FrameScript) are not shown
boolean preferScript = false;
if (treeItem instanceof TagScript) {
treeItem = ((TagScript) treeItem).getTag();
preferScript = true;
}
if (flashPanel != null) {
@@ -2216,6 +2218,8 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
}
previewPanel.setImageReplaceButtonVisible(false);
boolean internalViewer = isInternalFlashViewerSelected();
if (treeItem instanceof HeaderItem) {
showCard(CARDHEADER);
@@ -2226,7 +2230,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
} else if (treeItem instanceof SWF) {
SWF swf = (SWF) treeItem;
showCard(CARDPREVIEWPANEL);
if (isInternalFlashViewerSelected()) {
if (internalViewer) {
previewPanel.showImagePanel(swf, swf, -1);
} else {
previewPanel.setParametersPanelVisible(false);
@@ -2239,7 +2243,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
DefineBinaryDataTag binaryTag = (DefineBinaryDataTag) treeItem;
showCard(CARDPREVIEWPANEL);
previewPanel.showBinaryPanel(binaryTag);
} else if (treeItem instanceof ASMSource) {
} else if (treeItem instanceof ASMSource && (!(treeItem instanceof DrawableTag) || preferScript)) {
ensureActionPanel();
showCard(CARDACTIONSCRIPTPANEL);
getActionPanel().setSource((ASMSource) treeItem, !forceReload);
@@ -2248,7 +2252,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
previewPanel.setImageReplaceButtonVisible(imageTag.importSupported());
showCard(CARDPREVIEWPANEL);
previewPanel.showImagePanel(imageTag.getImage());
} else if ((treeItem instanceof DrawableTag) && (!(treeItem instanceof TextTag)) && (!(treeItem instanceof FontTag)) && (isInternalFlashViewerSelected())) {
} else if ((treeItem instanceof DrawableTag) && (!(treeItem instanceof TextTag)) && (!(treeItem instanceof FontTag)) && internalViewer) {
final Tag tag = (Tag) treeItem;
showCard(CARDPREVIEWPANEL);
DrawableTag d = (DrawableTag) tag;
@@ -2261,15 +2265,15 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
previewPanel.setParametersPanelVisible(false);
previewPanel.showImagePanel(timelined, tag.getSwf(), -1);
} else if ((treeItem instanceof FontTag) && (isInternalFlashViewerSelected())) {
} else if ((treeItem instanceof FontTag) && internalViewer) {
FontTag fontTag = (FontTag) treeItem;
showCard(CARDPREVIEWPANEL);
showFontTag(fontTag);
} else if ((treeItem instanceof TextTag) && (isInternalFlashViewerSelected())) {
} else if ((treeItem instanceof TextTag) && internalViewer) {
TextTag textTag = (TextTag) treeItem;
showCard(CARDPREVIEWPANEL);
showTextTag(textTag);
} else if (treeItem instanceof Frame && isInternalFlashViewerSelected()) {
} else if (treeItem instanceof Frame && internalViewer) {
showCard(CARDPREVIEWPANEL);
Frame fn = (Frame) treeItem;
SWF swf = fn.getSwf();
src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeModel.java
+3
View File
@@ -264,6 +264,9 @@ public class TagTreeModel implements TreeModel {
} else {
subNodes.add(ts);
}
} else if (tag instanceof ASMSource) {
TagScript ts = new TagScript(swf, tag, tagSubNodes);
subNodes.add(ts);
}
}
}