Changeset 1513 for trunk/src/org/expeditee/items/Item.java

Timestamp:

02/19/20 15:29:48 (4 years ago)

Author:

bnemhaus

Message:

You now have the ability to anchor Items to the center of the frame. AnchorCenterX: 0 will anchor a item directly to the vertical center of the frame. AnchorCenterY: 0 to the horizontal center of the frame. Negative numbers go left/up from the center, positive numbers right/down.

More work to come to deal with connected items such as rectangles made up on connected dots.

File:

• trunk/src/org/expeditee/items/Item.java (modified) (4 diffs)

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

@@ -3658 +3658 @@
                 }
         }
+        
+        public void setAnchorCenterX(Integer anchor) {
+                this._anchoring.setCenterXAnchor(anchor);
+                if (anchor != null) {
+                        anchorConstraints();
+                        int alignedToLeft = DisplayController.getFramePaintArea().getCentreX() + anchor;
+                        int alignedToCenter = alignedToLeft - (getBoundsWidth() / 2);
+                        setX(alignedToCenter);
+                }
+                
+                if (isSurrogate()) {
+                        surrogatePropertyInheritance.put(DefaultFrameWriter.ANCHOR_CENTERX_STR, false);
+                        Item primary = getPrimary();
+                        if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.ANCHOR_CENTERX_STR)) {
+                                EncryptionDetail inheritanceCheckOnSave = new EncryptionDetail(EncryptionDetail.Type.InheritanceCheckOnSave);
+                                primary.primaryPropertyEncryption.put(DefaultFrameWriter.ANCHOR_CENTERX_STR, inheritanceCheckOnSave);
+                        }
+                }
+        }
 
         public void setAnchorRight(Integer anchor) {
@@ -3694 +3713 @@
                 }
         }
+        
+        public void setAnchorCenterY(Integer anchor) {
+                this._anchoring.setCenterYAnchor(anchor);
+                if (anchor != null) {
+                        anchorConstraints();
+                        int alignedToTop = DisplayController.getFramePaintArea().getCentreY() + anchor;
+                        int alignedToCenter = alignedToTop - (getBoundsHeight() / 2);
+                        setY(alignedToCenter);
+                }
+                
+                if (isSurrogate()) {
+                        surrogatePropertyInheritance.put(DefaultFrameWriter.ANCHOR_CENTERY_STR, false);
+                        Item primary = getPrimary();
+                        if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.ANCHOR_CENTERY_STR)) {
+                                EncryptionDetail inheritanceCheckOnSave = new EncryptionDetail(EncryptionDetail.Type.InheritanceCheckOnSave);
+                                primary.primaryPropertyEncryption.put(DefaultFrameWriter.ANCHOR_CENTERY_STR, inheritanceCheckOnSave);
+                        }
+                }
+        }
 
 
@@ -3712 +3750 @@
                 }
         }
-
+                
         public boolean isAnchored()
         {
@@ -3755 +3793 @@
                 } else {
                         return _anchoring.getBottomAnchor();
+                }
+        }
+        
+        public Integer getAnchorCenterX() {
+                if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.ANCHOR_CENTERX_STR)) {
+                        return this.getPrimary().getAnchorCenterX();
+                } else {
+                        return _anchoring.getCenterXAnchor();
+                }
+        }
+        
+        public Integer getAnchorCenterY() {
+                if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.ANCHOR_CENTERY_STR)) {
+                        return this.getPrimary().getAnchorCenterY();
+                } else {
+                        return _anchoring.getCenterYAnchor();
                 }
         }