Changeset 805

Timestamp:

02/02/14 18:44:24 (10 years ago)

Author:

davidb

Message:

Variations of isAnchored() so panning can test if an Item is anchored Top/Bottom or Left/Right

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

@@ -1222 +1222 @@
         
         public static void pan(Frame frame, int x, int y) {
-                for(Item i : frame.getAllItems()) {
-                        if(i instanceof WidgetEdge || i instanceof WidgetCorner) {
+                for (Item i : frame.getAllItems()) {
+                        if (i instanceof WidgetEdge || i instanceof WidgetCorner) {
                                 continue;
-                        } else if(i instanceof XRayable) {
-                            if (!i.isAnchored()) {
-                                i.setPosition(i.getX() + x, i.getY() + y);
+                        } 
+                        else {
+                            int new_x = i.getX();
+                            int new_y = i.getY();
+
+                            if (!i.isAnchoredX()) {
+                                new_x += x;
                             }
-                        } else {
-                            if (!i.isAnchored()) {
-                                i.setXY(i.getX() + x, i.getY() + y);
+
+                            if (!i.isAnchoredY()) {
+                                new_y += y;
+                            }
+
+
+
+                            if ((new_x != x) || (new_y != y)) {
+
+                                if(i instanceof XRayable) {
+
+                                    i.setPosition(new_x,new_y);
+                                }
+
+                                else {
+                                    i.setXY(new_x,new_y);
+                                }
                             }
                         }
@@ -1237 +1255 @@
                         i.updatePolygon();
                 }
-                for(InteractiveWidget iw : frame.getInteractiveWidgets()) {
-                    if (!iw.isAnchored()) {
-                        iw.setPosition(iw.getX() + x, iw.getY() + y);
+
+                for (InteractiveWidget iw : frame.getInteractiveWidgets()) {
+
+                    int new_x = iw.getX();
+                    int new_y = iw.getY();
+                    
+                    if (!iw.isAnchoredX()) {
+                        new_x += x;
                     }
-                }
+                    
+                    if (!iw.isAnchoredY()) {
+                        new_y += y;
+                    }
+                    
+                    
+                    if ((new_x != x) || (new_y != y)) {
+                        
+                        iw.setPosition(new_x,new_y);
+                    }
+                }
+
                 // make sure we save the panning of the frame
                 frame.change();

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

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

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

@@ -251 +251 @@
 
         @Override
+        public boolean isAnchoredX() {
+                return _source.isAnchoredX();
+        }
+
+        @Override
+        public boolean isAnchoredY() {
+                return _source.isAnchoredY();
+        }
+
+        @Override
         public void setAnchorTop(Float anchor) {
                 _source.setAnchorTop(anchor);

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

@@ -1744 +1744 @@
         public boolean isAnchored() {
                 return getSource().isAnchored();
+        }
+
+        public boolean isAnchoredX() {
+                return getSource().isAnchoredX();
+        }
+
+        public boolean isAnchoredY() {
+                return getSource().isAnchoredY();
         }
         

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

@@ -152 +152 @@
         public boolean isAnchored() {
                 return _widgetSource.isAnchored();
+        }
+
+        @Override
+        public boolean isAnchoredX() {
+                return _widgetSource.isAnchoredX();
+        }
+
+        @Override
+        public boolean isAnchoredY() {
+                return _widgetSource.isAnchoredY();
         }
 

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

@@ -125 +125 @@
         public boolean isAnchored() {
                 return _widgetSource.isAnchored();
+        }
+
+        @Override
+        public boolean isAnchoredX() {
+                return _widgetSource.isAnchoredX();
+        }
+
+        @Override
+        public boolean isAnchoredY() {
+                return _widgetSource.isAnchoredY();
         }