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

Timestamp:

03/04/20 11:00:23 (4 years ago)

Author:

bnemhaus

Message:

Anchoring with AnchorCenterX and AnchorCenterY now work correctly with connected shapes.

File:

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

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

@@ -2907 +2907 @@
                 }
         }
+        
+        @Override
+        public void setAnchorCenterX(Integer anchor) {
+                if (!isLineEnd()) {
+                        super.setAnchorCenterX(anchor);
+                        // Subtract off the link width
+                        if (anchor != null) {
+                                int alignedToLeft = DisplayController.getFramePaintArea().getCentreX() + anchor;
+                                int alignedToCenter = alignedToLeft - (getBoundsWidth() / 2);
+                                setX(alignedToCenter);
+                        }
+                        return;
+                }
+                invalidateFill();
+                invalidateCommonTrait(ItemAppearence.PostMoved);
+                
+                this._anchoring.setCenterXAnchor(anchor);
+                
+                int oldX = getX();
+                if (anchor != null) {
+                        float deltaX = DisplayController.getFramePaintArea().getCentreX() - anchor - getBoundsWidth() + getLeftMargin() - oldX;
+                        anchorConnected(AnchorEdgeType.CenterY, deltaX);
+                }
+                
+                invalidateCommonTrait(ItemAppearence.PostMoved);
+                invalidateFill();
+                
+                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);
+                        }
+                }
+        }
 
         @Override
@@ -2983 +3019 @@
                                 primary.primaryPropertyEncryption.put(DefaultFrameWriter.ANCHOR_TOP_STR, inheritanceCheckOnSave);
                         }
+                }
+        }
+        
+        @Override
+        public void setAnchorCenterY(Integer anchor) {
+                if (!isLineEnd()) {
+                        super.setAnchorCenterY(anchor);
+                        if (anchor != null) {
+                                List<TextLayout> textLayouts = getTextLayouts();
+                                if (!textLayouts.isEmpty()) {
+                                        int middle = textLayouts.size() / 2;
+                                        float heightFromTopOfTextItem = 0;
+                                        for (int i = 0; i <= middle; i++) {
+                                                TextLayout tl = textLayouts.get(i);
+                                                float ascent = tl.getAscent();
+                                                float descent = tl.getDescent();
+                                                heightFromTopOfTextItem += (ascent + descent);
+                                        }
+                                        heightFromTopOfTextItem -= textLayouts.get(middle).getDescent();
+                                        float anchorCalc = anchor + this.getBoundsHeight() - heightFromTopOfTextItem;
+                                        setY((DisplayController.getFramePaintAreaHeight() / 2) - anchorCalc);
+                                } else if (this.getFont() != null) {
+                                        // p could be any character
+                                        TextLayout fakeLayout = TextLayout.getManager().layoutStringSimple("p", this.getFont());
+                                        float ascent = fakeLayout.getAscent();
+                                        float descent = fakeLayout.getDescent();
+                                        float middle = descent - ascent;
+                                        float anchorCalc = anchor + this.getBoundsHeight() - middle;
+                                        setY((DisplayController.getFramePaintAreaHeight() / 2) - anchorCalc);
+                                }
+                        }
+                        return;
                 }
         }