Changeset 774

Timestamp:

01/28/14 22:04:27 (10 years ago)

Author:

davidb

Message:

Mouse panning action updated to take into account the status of any items that are anchored, and therefore shouldn't move

Location:

trunk/src/org/expeditee

Files:

• actions/Misc.java (modified) (2 diffs)
• items/Item.java (modified) (1 diff)
• items/XRayable.java (modified) (1 diff)
• items/widgets/InteractiveWidget.java (modified) (1 diff)
• items/widgets/WidgetCorner.java (modified) (1 diff)
• items/widgets/WidgetEdge.java (modified) (1 diff)

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

@@ -1226 +1226 @@
                                 continue;
                         } else if(i instanceof XRayable) {
+                            if (!i.isAnchored()) {
                                 i.setPosition(i.getX() + x, i.getY() + y);
+                            }
                         } else {
+                            if (!i.isAnchored()) {
                                 i.setXY(i.getX() + x, i.getY() + y);
+                            }
                         }
                         // update the polygon, otherwise stuff moves but leaves it's outline behind
@@ -1234 +1238 @@
                 }
                 for(InteractiveWidget iw : frame.getInteractiveWidgets()) {
+                    if (!iw.isAnchored()) {
                         iw.setPosition(iw.getX() + x, iw.getY() + y);
+                    }
                 }
                 // make sure we save the panning of the frame

trunk/src/org/expeditee/items/Item.java

@@ -2873 +2873 @@
 
 
+        public boolean isAnchored() {
+            return ((_anchorLeft != null) || (_anchorRight != null) 
+                    || (_anchorTop != null) || (_anchorBottom != null));
+        }
+
         public Float getAnchorLeft() {
                 return _anchorLeft;

trunk/src/org/expeditee/items/XRayable.java

@@ -246 +246 @@
         
         @Override
+        public boolean isAnchored() {
+                return _source.isAnchored();
+        }
+
+        @Override
         public void setAnchorTop(Float anchor) {
                 _source.setAnchorTop(anchor);

trunk/src/org/expeditee/items/widgets/InteractiveWidget.java

@@ -1740 +1740 @@
                             getY());
                 getSource().setAnchorRight(anchor);
+        }
+
+        public boolean isAnchored() {
+                return getSource().isAnchored();
         }
         

trunk/src/org/expeditee/items/widgets/WidgetCorner.java

@@ -147 +147 @@
         public String getLink() {
                 return _widgetSource.getSource().getLink();
+        }
+
+        @Override
+        public boolean isAnchored() {
+                return _widgetSource.isAnchored();
         }
 

trunk/src/org/expeditee/items/widgets/WidgetEdge.java

@@ -120 +120 @@
         public void setAnchorRight(Float anchor) {
                 _widgetSource.setAnchorRight(anchor);
+        }
+
+        @Override
+        public boolean isAnchored() {
+                return _widgetSource.isAnchored();
         }