Changeset 634

Timestamp:

12/17/13 17:00:02 (10 years ago)

Author:

jts21

Message:

Fix image and widget panning

File:

• trunk/src/org/expeditee/actions/Misc.java (modified) (2 diffs)

trunk/src/org/expeditee/actions/Misc.java

@@ -44 +44 @@
 import org.expeditee.items.Line;
 import org.expeditee.items.Text;
+import org.expeditee.items.XRayable;
 import org.expeditee.items.widgets.InteractiveWidget;
-import org.expeditee.items.widgets.InteractiveWidgetInitialisationFailedException;
 import org.expeditee.items.widgets.JfxBrowser;
+import org.expeditee.items.widgets.WidgetCorner;
+import org.expeditee.items.widgets.WidgetEdge;
 import org.expeditee.math.ExpediteeJEP;
 import org.expeditee.settings.UserSettings;
@@ -1473 +1475 @@
         public static void pan(Frame frame, int x, int y) {
                 for(Item i : frame.getAllItems()) {
-                        i.setXY(i.getX() + x, i.getY() + y);
+                        if(i instanceof WidgetEdge || i instanceof WidgetCorner) {
+                                continue;
+                        } else if(i instanceof XRayable) {
+                                i.setPosition(i.getX() + x, i.getY() + y);
+                        } else {
+                                i.setXY(i.getX() + x, i.getY() + y);
+                        }
                         // update the polygon, otherwise stuff moves but leaves it's outline behind
-                        // (maybe this should use setPosition() instead?)
                         i.updatePolygon();
+                }
+                for(InteractiveWidget iw : frame.getInteractiveWidgets()) {
+                        iw.setPosition(iw.getX() + x, iw.getY() + y);
                 }
                 // make sure we save the panning of the frame