X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bundles%2Forg.simantics.diagram%2Fsrc%2Forg%2Fsimantics%2Fdiagram%2Felements%2FTextElementNoBounds.java;h=14bc7c1f69609777240310ca8cdf88f82c5bff1d;hb=7704490bfa8dc36625615df61cfe18d01d86ff18;hp=6959e8c439f2bbd4d942eae1137682e687952015;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextElementNoBounds.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextElementNoBounds.java
index 6959e8c43..14bc7c1f6 100644
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextElementNoBounds.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextElementNoBounds.java
@@ -49,7 +49,7 @@ public class TextElementNoBounds implements SceneGraph, HandleMouseEvent {
     
     protected static final double DEFAULT_PADDING_X = 0.5;
     protected static final double DEFAULT_PADDING_Y = 0.5;
-    protected static final double SCALE = 0.235;
+    protected static final double DEFAULT_SCALE = 0.235;
 
     protected final double originX;
     protected final double originY;
@@ -59,6 +59,7 @@ public class TextElementNoBounds implements SceneGraph, HandleMouseEvent {
     protected final boolean editable;
     protected final double paddingX;
     protected final double paddingY;
+    protected final double scale;
 
 
     public TextElementNoBounds() {
@@ -74,20 +75,28 @@ public class TextElementNoBounds implements SceneGraph, HandleMouseEvent {
     }
     
     public TextElementNoBounds(double originX, double originY, Alignment horizontalAlignment, double borderWidth, double paddingX, double paddingY, boolean editable) {
+    	this(originX, originY, horizontalAlignment, borderWidth, paddingX, paddingY, editable, DEFAULT_SCALE);
+    }
+    
+    public TextElementNoBounds(double originX, double originY, Alignment horizontalAlignment, double borderWidth, double paddingX, double paddingY, boolean editable, double scale) {
+    	this(originX, originY, horizontalAlignment, Alignment.BASELINE, borderWidth, paddingX, paddingY, editable, scale);
+    }
+    
+    public TextElementNoBounds(double originX, double originY, Alignment horizontalAlignment, Alignment verticalAlignment, double borderWidth, double paddingX, double paddingY, boolean editable, double scale) {
         if (horizontalAlignment == null)
             throw new NullPointerException("null horizontal alignment");
 
         this.originX = originX;
         this.originY = originY;
         this.horizontalAlignment = horizontalAlignment;
-        this.verticalAlignment = Alignment.BASELINE;
+        this.verticalAlignment = verticalAlignment;
         this.borderWidth = borderWidth;
         this.editable = editable;
         this.paddingX = paddingX;
         this.paddingY = paddingY;
+        this.scale = scale;
     }
     
-
     @Override
     public void init(final IElement e, G2DParentNode parent) {
         TextNode node = getOrCreateTextNode(e, parent);
@@ -102,7 +111,7 @@ public class TextElementNoBounds implements SceneGraph, HandleMouseEvent {
         Alignment vAlign = ElementUtils.getHintOrDefault(e, ElementHints.KEY_VERTICAL_ALIGN, verticalAlignment);
         Double borderWidth = ElementUtils.getHintOrDefault(e, MonitorClass.KEY_BORDER_WIDTH, this.borderWidth);
 
-        node.init(text, font, color, originX, originY, SCALE);
+        node.init(text, font, color, originX, originY, scale);
         node.setBackgroundColor(fillColor);
         node.setBorderColor(borderColor);
         node.setHorizontalAlignment((byte) hAlign.ordinal());