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

Added #1731 Image viewer zoom support

Browse Source
This commit is contained in:
Jindra Petřík
2022-10-23 16:50:55 +02:00
parent 41fe9616a1
commit 1bfbe84ee9
6 changed files with 175 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/com/jpexs/decompiler/flash/gui/ImagePanel.java
View File

@@ -16,6 +16,7 @@
*/
package com.jpexs.decompiler.flash.gui;
import com.jpexs.decompiler.flash.ReadOnlyTagList;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.SWFInputStream;
import com.jpexs.decompiler.flash.action.Action;
@@ -48,6 +49,7 @@ import com.jpexs.decompiler.flash.types.SOUNDINFO;
import com.jpexs.decompiler.flash.exporters.commonshape.ExportRectangle;
import com.jpexs.decompiler.flash.tags.DefineButton2Tag;
import com.jpexs.decompiler.flash.tags.DefineButtonTag;
import com.jpexs.decompiler.flash.tags.Tag;
import com.jpexs.decompiler.flash.tags.base.DisplayObjectCacheKey;
import com.jpexs.decompiler.flash.types.BUTTONCONDACTION;
import com.jpexs.helpers.ByteArrayRange;
@@ -93,6 +95,7 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Timer;
import java.util.TimerTask;
import java.util.logging.Level;
@@ -165,6 +168,8 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
private TextTag newTextTag;
private boolean showObjectsUnderCursor;
private int msPerFrame;
private final boolean lowQuality = false;
@@ -1506,7 +1511,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
return zoomAvailable;
}
public void setTimelined(final Timelined drawable, final SWF swf, int frame) {
public void setTimelined(final Timelined drawable, final SWF swf, int frame, boolean showObjectsUnderCursor) {
Stage stage = new Stage(drawable) {
@Override
public void callFrame(int frame) {
@@ -1611,6 +1616,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
}
}
this.showObjectsUnderCursor = showObjectsUnderCursor;
fireMediaDisplayStateChanged();
}
@@ -1720,6 +1726,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
fireMediaDisplayStateChanged();
}
showObjectsUnderCursor = false;
textTag = null;
newTextTag = null;
displayObjectCache.clear();
@@ -2199,32 +2206,39 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
StringBuilder ret = new StringBuilder();
if (cursorPosition != null) {
ret.append(" [").append(cursorPosition.x).append(",").append(cursorPosition.y).append("] : ");
ret.append(" [").append(cursorPosition.x).append(",").append(cursorPosition.y).append("]");
if (showObjectsUnderCursor) {
ret.append(" : ");
}
}
boolean handCursor = renderContext.mouseOverButton != null;
boolean first = true;
for (int i = renderContext.stateUnderCursor.size() - 1; i >= 0; i--) {
DepthState ds = renderContext.stateUnderCursor.get(i);
if (!first) {
ret.append(", ");
if (showObjectsUnderCursor) {
boolean first = true;
for (int i = renderContext.stateUnderCursor.size() - 1; i >= 0; i--) {
DepthState ds = renderContext.stateUnderCursor.get(i);
if (!first) {
ret.append(", ");
}
first = false;
CharacterTag c = swf.getCharacter(ds.characterId);
ret.append(c.toString());
if (ds.depth > 0) {
ret.append(" ");
ret.append(AppStrings.translate("imagePanel.depth"));
ret.append(" ");
ret.append(ds.depth);
}
}
first = false;
CharacterTag c = swf.getCharacter(ds.characterId);
ret.append(c.toString());
if (ds.depth > 0) {
ret.append(" ");
ret.append(AppStrings.translate("imagePanel.depth"));
ret.append(" ");
ret.append(ds.depth);
if (first) {
ret.append(" - ");
}
}
if (first) {
ret.append(" - ");
}
ButtonTag lastMouseOverButton;
synchronized (ImagePanel.class) {
if (timer == thisTimer) {