From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Fri, 5 Mar 2021 13:19:44 +0000 (+0000)
Subject: Merge "Use paddings when calculating Text bounds." into release/1.43.1
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=b78042812948b7014557c9c34318e3a66c031101;hp=7be9344a1c2c96918b99693920a7e41329023342;p=simantics%2Fplatform.git

Merge "Use paddings when calculating Text bounds." into release/1.43.1
---

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextElementHandler.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextElementHandler.java
index f7dd3a0fd..39ca504aa 100644
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextElementHandler.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextElementHandler.java
@@ -63,10 +63,10 @@ public class TextElementHandler extends TextElementNoBounds implements InternalS
 
 	@Override
     public Rectangle2D getBounds(IElement e, Rectangle2D size) {
-        return calculateBounds(e, size, horizontalAlignment, verticalAlignment, scale, paddingX, paddingY);
+        return getBounds(e, size, horizontalAlignment, verticalAlignment, scale, paddingX, paddingY);
     }
-    
-    public static Rectangle2D calculateBounds(
+	
+	public static Rectangle2D getBounds(
             IElement e,
             Rectangle2D size, 
             Alignment horizontalAlignment, 
@@ -74,32 +74,46 @@ public class TextElementHandler extends TextElementNoBounds implements InternalS
             double scale,
             double paddingX,
             double paddingY) {
-        
         TextNode node = (TextNode) e.getHint(SG_NODE);
         Rectangle2D b = e.getHint(ElementHints.KEY_BOUNDS);
-
+        
         if (size == null)
             size = new Rectangle2D.Double();
         if (node != null)
             size.setRect(node.getBoundsInLocal());
         else if(b != null && ElementUtils.getHintOrDefault(e, ElementHints.KEY_RESIZABLE, false))
             size.setRect(b);
-        else {
-            String text = e.getHint(ElementHints.KEY_TEXT);
-            Font font = e.getHint(ElementHints.KEY_FONT);
-            if(text == null || font == null)
-               size.setFrame(0, 0, 0, 0);
-            else {
-	            TextNode n= new TextNode();
-	            n.init(text, font, Color.black, 0.0, 0.0, scale);
-	            n.setHorizontalAlignment((byte)horizontalAlignment.ordinal());
-	            n.setVerticalAlignment((byte)verticalAlignment.ordinal());
-	            
-	            Rectangle2D r = n.getBoundsInLocal();
-	            size.setFrame(r);
-	            return r;
-            }
-        }
+        else calculateBounds(e, size, horizontalAlignment, verticalAlignment, scale, paddingX, paddingY);
+        
+        return size;
+	}
+    
+    public static Rectangle2D calculateBounds(
+            IElement e,
+            Rectangle2D size, 
+            Alignment horizontalAlignment, 
+            Alignment verticalAlignment,
+            double scale,
+            double paddingX,
+            double paddingY) {
+
+    	if (size == null)
+            size = new Rectangle2D.Double();
+    	
+        String text = e.getHint(ElementHints.KEY_TEXT);
+        Font font = e.getHint(ElementHints.KEY_FONT);
+        if(text == null || font == null) {
+           size.setFrame(0, 0, 0, 0);
+        } else {
+            TextNode n= new TextNode();
+            n.init(text, font, Color.black, 0.0, 0.0, scale);
+            n.setHorizontalAlignment((byte)horizontalAlignment.ordinal());
+            n.setVerticalAlignment((byte)verticalAlignment.ordinal());
+            n.setPadding(paddingX, paddingY);
+            Rectangle2D r = n.getBoundsInLocal();
+            size.setFrame(r);
+            return r;
+        }   
         return size;
         
     }