From ee0533d4b1701e9e27dcce90822f241fd7f33f28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sun, 4 May 2025 01:00:44 +0200
Subject: [PATCH] Guides cursor

---
 .../decompiler/flash/gui/ImagePanel.java      |  87 +++++++++++++++++-
 .../flash/gui/graphics/cursors/guide_x.png    | Bin 0 -> 4324 bytes
 .../flash/gui/graphics/cursors/guide_y.png    | Bin 0 -> 4331 bytes
 3 files changed, 82 insertions(+), 5 deletions(-)
 create mode 100644 src/com/jpexs/decompiler/flash/gui/graphics/cursors/guide_x.png
 create mode 100644 src/com/jpexs/decompiler/flash/gui/graphics/cursors/guide_y.png

diff --git a/src/com/jpexs/decompiler/flash/gui/ImagePanel.java b/src/com/jpexs/decompiler/flash/gui/ImagePanel.java
index fcf0dcdad..06bab3f04 100644
--- a/src/com/jpexs/decompiler/flash/gui/ImagePanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/ImagePanel.java
@@ -247,6 +247,9 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
     private static final int MODE_SHEAR_N = -7;
     private static final int MODE_SHEAR_W = -8;
 
+    private static final int MODE_GUIDE_X = -9;
+    private static final int MODE_GUIDE_Y = -10;
+
     private static Cursor moveCursor;
     private static Cursor moveRegPointCursor;
     private static Cursor resizeNWSECursor;
@@ -260,6 +263,8 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
     private static Cursor movePointCursor;
     private static Cursor defaultCursor;
     private static Cursor addPointCursor;
+    private static Cursor guideXCursor;
+    private static Cursor guideYCursor;
 
     private Point2D offsetPoint = new Point2D.Double(0, 0);
 
@@ -365,6 +370,8 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
 
     private static final int GUIDE_TEXT_OFFSET = 10;
 
+    private static final int GUIDE_MOVE_TOLERANCE = 2;
+
     private SWF guidesSwf = null;
 
     private int guidesCharacterId = -1;
@@ -650,6 +657,8 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
             movePointCursor = loadCursor("move_point", 0, 0);
             defaultCursor = loadCursor("default", 0, 0);
             addPointCursor = loadCursor("add_point", 0, 0);
+            guideXCursor = loadCursor("guide_x", 0, 0);
+            guideYCursor = loadCursor("guide_y", 0, 0);
         } catch (IOException ex) {
             Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, null, ex);
         }
@@ -1349,13 +1358,13 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
                             }
                         }
 
-                        int guideTolerance = 2;
+                        mouseMoved(e); //to correctly calculate mode, because mouseMoved event is not called during dragging                                                                                               
 
                         Point mousePoint = e.getPoint();
                         for (int d = 0; d < guidesX.size(); d++) {
                             Double guide = guidesX.get(d);
                             int guideInPanel = (int) Math.round(guide * getRealZoom() + offsetPoint.getX());
-                            if (mousePoint.x >= guideInPanel - guideTolerance && mousePoint.x <= guideInPanel + guideTolerance) {
+                            if (mousePoint.x >= guideInPanel - GUIDE_MOVE_TOLERANCE && mousePoint.x <= guideInPanel + GUIDE_MOVE_TOLERANCE) {
                                 guidesX.remove(d);
                                 guideDragX = guideInPanel;
                                 draggingGuideX = true;
@@ -1367,7 +1376,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
                         for (int d = 0; d < guidesY.size(); d++) {
                             Double guide = guidesY.get(d);
                             int guideInPanel = (int) Math.round(guide * getRealZoom() + offsetPoint.getY());
-                            if (mousePoint.y >= guideInPanel - guideTolerance && mousePoint.y <= guideInPanel + guideTolerance) {
+                            if (mousePoint.y >= guideInPanel - GUIDE_MOVE_TOLERANCE && mousePoint.y <= guideInPanel + GUIDE_MOVE_TOLERANCE) {
                                 guidesY.remove(d);
                                 guideDragY = guideInPanel;
                                 draggingGuideY = true;
@@ -1376,7 +1385,6 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
                             }
                         }
 
-                        mouseMoved(e); //to correctly calculate mode, because mouseMoved event is not called during dragging                                                                                               
                         setDragStart(e.getPoint());
 
                         if (!shiftDown) {
@@ -1556,6 +1564,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
 
                 @Override
                 public void mouseDragged(MouseEvent e) {
+                    mouseMoved(e);
                     List<DisplayPoint> points = hilightedPoints;
 
                     if (dragStart != null && multiSelect && !inMoving && mode == Cursor.DEFAULT_CURSOR) {
@@ -2209,6 +2218,31 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
                         }
                         return;
                     }
+
+                    boolean nearGuideX = draggingGuideX;
+                    boolean nearGuideY = draggingGuideY;
+
+                    if (!draggingGuideX && !draggingGuideY) {
+                        Point mousePoint = e.getPoint();
+                        for (int d = 0; d < guidesX.size(); d++) {
+                            Double guide = guidesX.get(d);
+                            int guideInPanel = (int) Math.round(guide * getRealZoom() + offsetPoint.getX());
+                            if (mousePoint.x >= guideInPanel - GUIDE_MOVE_TOLERANCE && mousePoint.x <= guideInPanel + GUIDE_MOVE_TOLERANCE) {
+                                nearGuideX = true;
+                                break;
+                            }
+                        }
+
+                        for (int d = 0; d < guidesY.size(); d++) {
+                            Double guide = guidesY.get(d);
+                            int guideInPanel = (int) Math.round(guide * getRealZoom() + offsetPoint.getY());
+                            if (mousePoint.y >= guideInPanel - GUIDE_MOVE_TOLERANCE && mousePoint.y <= guideInPanel + GUIDE_MOVE_TOLERANCE) {
+                                nearGuideY = true;
+                                break;
+                            }
+                        }
+                    }
+
                     if (doFreeTransform) {
                         if (bounds == null) {
                             return;
@@ -2306,6 +2340,12 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
                                 newMode = MODE_SHEAR_S;
                             }
                             cursor = shearXCursor;
+                        } else if (nearGuideX) {
+                            newMode = MODE_GUIDE_X;
+                            cursor = guideXCursor;
+                        } else if (nearGuideY) {
+                            newMode = MODE_GUIDE_Y;
+                            cursor = guideYCursor;
                         } else if (inBounds) {
                             newMode = Cursor.MOVE_CURSOR;
                             cursor = moveCursor;
@@ -2314,6 +2354,23 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
                             cursor = defaultCursor;
                         }
 
+                        if (getCursor() != cursor) {
+                            setCursor(cursor);
+                        }
+                        mode = newMode;
+                    } else {
+                        Cursor cursor = null;
+                        Integer newMode = null;
+                        if (nearGuideX) {
+                            newMode = MODE_GUIDE_X;
+                            cursor = guideXCursor;
+                        } else if (nearGuideY) {
+                            newMode = MODE_GUIDE_Y;
+                            cursor = guideYCursor;
+                        } else {
+                            newMode = Cursor.DEFAULT_CURSOR;
+                            cursor = Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR);
+                        }
                         if (getCursor() != cursor) {
                             setCursor(cursor);
                         }
@@ -2683,6 +2740,17 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
             @Override
             public void mouseDragged(MouseEvent e) {
                 Component c = SwingUtilities.getDeepestComponentAt(ImagePanel.this, e.getX(), e.getY());
+
+                if (c == topRuler) {
+                    if (topRuler.getCursor() != guideYCursor) {
+                        topRuler.setCursor(guideYCursor);
+                    }
+                } else if (c == leftRuler) {
+                    if (leftRuler.getCursor() != guideXCursor) {
+                        leftRuler.setCursor(guideXCursor);
+                    }
+                }
+
                 if (c != iconPanel) {
                     return;
                 }
@@ -2730,9 +2798,11 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
                 if (c == topRuler) {
                     draggingGuideY = true;
                     guideDragY = -1;
+                    topRuler.setCursor(guideYCursor);
                 } else if (c == leftRuler) {
                     draggingGuideX = true;
                     guideDragX = -1;
+                    leftRuler.setCursor(guideXCursor);
                 } else if (c == iconPanel) {
                     for (MouseListener l : iconPanel.mouseListeners) {
                         l.mousePressed(convertMouseEvent(e, iconPanel));
@@ -2763,6 +2833,9 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
                 guideDragX = -1;
                 guideDragY = -1;
 
+                topRuler.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+                leftRuler.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+
                 if (c != iconPanel) {
                     return;
                 }
@@ -4475,7 +4548,11 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
                             }
                             if (!doFreeTransform && hilightedPoints == null) {
                                 Cursor newCursor;
-                                if (iconPanel.isAltDown() && !selectionMode) {
+                                if (mode == MODE_GUIDE_X) {
+                                    newCursor = guideXCursor;
+                                } else if (mode == MODE_GUIDE_Y) {
+                                    newCursor = guideYCursor;
+                                } else if (iconPanel.isAltDown() && !selectionMode) {
                                     if (depthStateUnderCursor == null) {
                                         newCursor = Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR);
                                     } else {
diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/cursors/guide_x.png b/src/com/jpexs/decompiler/flash/gui/graphics/cursors/guide_x.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e6aa731ac8e83e73ffe784bf41e49943da066cd
GIT binary patch
literal 4324
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

literal 0
HcmV?d00001

diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/cursors/guide_y.png b/src/com/jpexs/decompiler/flash/gui/graphics/cursors/guide_y.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad00c034a860ed9ce4e51e81480c44e0963bf849
GIT binary patch
literal 4331
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

literal 0
HcmV?d00001