LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-15 18:31:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: Snap align and snap to objects incorrect position when editing nested layers

Browse Source
This commit is contained in:
Jindra Petřík
2025-05-17 19:19:42 +02:00
parent a18c1ad873
commit e38fad0271
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1956,13 +1956,12 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
Double snapOffsetY = null;
double zoomDouble = getRealZoom();
Matrix parentMatrix = getParentMatrix();
if (Configuration.snapAlign.get() && timelined != null && points == null && transform != null) {
Frame fr = timelined.getTimeline().getFrame(frame);
if (fr != null) {
Timeline timeline = timelined.getTimeline();
Matrix parentMatrix = getParentMatrix();
Timeline timeline = timelined.getTimeline();
Point2D mouseTransPoint = toTransformPoint(new Point2D.Double(e.getX(), e.getY()));
double ex = mouseTransPoint.getX();
@@ -2141,8 +2140,9 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
Matrix dsMatrix = new Matrix();
if (ds.matrix != null) {
dsMatrix = new Matrix(ds.matrix);
dsMatrix = new Matrix(ds.matrix);
}
dsMatrix = dsMatrix.concatenate(parentMatrix);
Rectangle2D bounds = dsMatrix.transform(new Rectangle2D.Double(rect.Xmin, rect.Ymin, rect.Xmax - rect.Xmin, rect.Ymax - rect.Ymin));
bounds = new Rectangle2D.Double(
@@ -2304,6 +2304,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
if (depthStateUnderCursor.matrix != null) {
matrix = matrix.preConcatenate(new Matrix(depthStateUnderCursor.matrix));
}
matrix = matrix.concatenate(parentMatrix);
Matrix scaleMatrix = Matrix.getScaleInstance(zoomDouble / SWF.unitDivisor);