LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-29 01:46:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: do not reset position on selection of same timelined (#2670)

Browse Source 
Closes #2670
This commit is contained in:
Jindra Petřík
2026-03-27 23:24:34 +01:00
parent 027f4040cd
commit ce27c129cf
2 changed files with 55 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,6 +116,7 @@ import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
import java.awt.image.VolatileImage;
import java.io.IOException;
import java.lang.ref.WeakReference;
import java.text.DecimalFormat;
import java.text.ParseException;
import java.util.ArrayList;
@@ -414,6 +415,8 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
private boolean textCursorBlinkOn = false;
private WeakReference<Timelined> lastTimelinedRef = null;
/**
* This was a test to edit texts inline, but it failed horribly.
* You can try to enable it, but the results are bad, very bad.
@@ -820,6 +823,42 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
depths.add(depth);
}
selectDepths(depths);
/*
if (timelined != null) {
Frame frameObj = timelined.getTimeline().getFrame(frame);
if (frameObj.layers.containsKey(depth)) {
DepthState ds = frameObj.layers.get(depth);
CharacterTag ch = ds.getCharacter();
if (ch instanceof DrawableTag) {
DrawableTag dt = (DrawableTag) ch;
if (ds.matrix != null) {
Matrix m = new Matrix(ds.matrix);
m = m.preConcatenate(Matrix.getScaleInstance(getRealZoom() / SWF.unitDivisor));
RECT drawableRect = dt.getRect();
ExportRectangle rect = m.transform(new ExportRectangle(drawableRect));
if (rect.xMax + offsetPoint.getX() < 0
|| rect.yMax + offsetPoint.getY() < 0
|| rect.xMin + offsetPoint.getX() > iconPanel.getWidth()
|| rect.yMin + offsetPoint.getY() > iconPanel.getHeight()
) {
double offsetX = -rect.xMin;
double offsetY = -rect.yMin;
if (rect.getWidth() < iconPanel.getWidth()) {
offsetX += (iconPanel.getWidth() - rect.getWidth()) / 2;
}
if (rect.getHeight() < iconPanel.getHeight()) {
offsetY += (iconPanel.getHeight() - rect.getHeight()) / 2;
}
offsetPoint.setLocation(offsetX, offsetY);
repaint();
}
}
}
}
}*/
}
}
public synchronized void selectDepths(List<Integer> depths) {
@@ -4742,8 +4781,14 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
this.timelined = drawable;
this.parentTimelineds.clear();
this.parentFrames.clear();
this.parentDepths.clear();
centerImage();
this.parentDepths.clear();
Timelined lastTimelined = lastTimelinedRef == null ? null : lastTimelinedRef.get();
boolean sameTimelined = lastTimelined == drawable;
if (!sameTimelined) {
centerImage();
}
lastTimelinedRef = new WeakReference<>(drawable);
this.swf = swf;
zoomAvailable = allowZoom;
if (frame > -1) {
@@ -4797,7 +4842,12 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
pointEditPanel.setVisible(false);
this.showObjectsUnderCursor = showObjectsUnderCursor;
this.registrationPointPosition = RegistrationPointPosition.CENTER;
iconPanel.calcRect();
if (sameTimelined) {
updateScrollBars();
} else {
iconPanel.calcRect();
}
if (selectionMode) {
SwfSpecificCustomConfiguration conf = Configuration.getOrCreateSwfSpecificCustomConfiguration(swf);

3
src/com/jpexs/decompiler/flash/gui/PreviewPanel.java
View File

@@ -603,7 +603,8 @@ public class PreviewPanel extends JPersistentSplitPane implements TagEditorPanel
public void actionPerformed(ActionEvent e) {
PlaceObjectTypeTag placeObject = imagePanel.getPlaceTagUnderCursor();
if (placeObject != null) {
mainPanel.setTagTreeSelectedNode(mainPanel.getCurrentTree(), placeObject);
displayEditImagePanel.zoom(imagePanel.getZoom());
mainPanel.setTagTreeSelectedNode(mainPanel.getCurrentTree(), placeObject);
}
}
});