Changeset 812 for trunk/src/org/expeditee/items/Text.java

Timestamp:

02/03/14 13:46:41 (10 years ago)

Author:

davidb

Message:

When setting an anchor left/rightr/top/bottom on a Dot, it now looks for connected items that are constrained to the the same x (vertical) or y (horizontal) value, and sets the anchor status of that item to be the same.

File:

• trunk/src/org/expeditee/items/Text.java (modified) (8 diffs)

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

@@ -2466 +2466 @@
                 invalidateFill();
                 invalidateCommonTrait(ItemAppearence.PreMoved);
+                
+                this._anchorLeft = anchor;
+                this._anchorRight = null;
+                
                 int oldX = getX();
                 if (anchor != null) {
@@ -2471 +2475 @@
                         anchorConnected(AnchorEdgeType.Left, deltaX);
                 }
-                this._anchorLeft = anchor;
-                this._anchorRight = null;
+
                 invalidateCommonTrait(ItemAppearence.PostMoved);
                 invalidateFill();
@@ -2490 +2493 @@
                 invalidateFill();
                 invalidateCommonTrait(ItemAppearence.PreMoved);
+                
+                this._anchorRight = anchor;
+                this._anchorLeft = null;
+                
                 int oldX = getX();
                 if (anchor != null) {
@@ -2496 +2503 @@
                         anchorConnected(AnchorEdgeType.Right, deltaX);
                 }
-                this._anchorRight = anchor;
-                this._anchorLeft = null;
+
                 invalidateCommonTrait(ItemAppearence.PostMoved);
                 invalidateFill();
@@ -2515 +2521 @@
                 invalidateFill();
                 invalidateCommonTrait(ItemAppearence.PreMoved);
+                
+                this._anchorTop = anchor;
+                this._anchorBottom = null;
+                
                 int oldY = getY();
                 if (anchor != null) {
@@ -2520 +2530 @@
                         anchorConnected(AnchorEdgeType.Top, deltaY);
                 }
-                this._anchorTop = anchor;
-                this._anchorBottom = null;
+
                 invalidateCommonTrait(ItemAppearence.PostMoved);
                 invalidateFill();
@@ -2534 +2543 @@
                 invalidateFill();
                 invalidateCommonTrait(ItemAppearence.PreMoved);
+                
+                this._anchorBottom = anchor;
+                this._anchorTop = null;
+                
                 int oldY = getY();
                 if (anchor != null) {
@@ -2541 +2554 @@
                         anchorConnected(AnchorEdgeType.Bottom, deltaY);
                 }
-                this._anchorBottom = anchor;
-                this._anchorTop = null;
+
                 invalidateCommonTrait(ItemAppearence.PostMoved);
                 invalidateFill();