Fix: Span is kept after resizing

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@13634 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/expressions/AuxiliaryExpressionViewFactor.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/expressions/AuxiliaryExpressionViewFactor.java
index 0a6810a57da22bc500eb27911ca96250e8a7d1c7..1ed9a96596b4dd7f39aeed3ce62ce6e93c0be2d4 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/expressions/AuxiliaryExpressionViewFactor.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/expressions/AuxiliaryExpressionViewFactor.java
@@ -34,7 +34,6 @@ public class AuxiliaryExpressionViewFactor implements IExpressionViewFactor {
 \r
         final String equation = data.get("equation") != null ? (String)data.get("equation") : "";\r
         \r
-        GridDataFactory.fillDefaults().grab(true, true).applyTo(parent);\r
         GridLayoutFactory.fillDefaults().numColumns(2).spacing(3, 3).applyTo(parent);\r
         equationLabel = new Label(parent, SWT.NONE);\r
         equationLabel.setFont(FONT);\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/expressions/ConstantExpressionViewFactor.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/expressions/ConstantExpressionViewFactor.java
index def62261fed08adc62e8701da456291890fb893c..3766a2679938e9c80f2bd1999fcaaac9f9912405 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/expressions/ConstantExpressionViewFactor.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/expressions/ConstantExpressionViewFactor.java
@@ -34,7 +34,6 @@ public class ConstantExpressionViewFactor implements IExpressionViewFactor {
 \r
         final String equation = data.get("equation") != null ? (String)data.get("equation") : "";\r
 \r
-        GridDataFactory.fillDefaults().grab(true, true).applyTo(parent);\r
         GridLayoutFactory.fillDefaults().numColumns(2).spacing(3, 3).applyTo(parent);\r
         equationLabel = new Label(parent, SWT.NONE);\r
         equationLabel.setFont(FONT);\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/expressions/ParameterExpressionViewFactor.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/expressions/ParameterExpressionViewFactor.java
index 66a00b3a418bf22f052d29fe31cb200c31836ab5..0f8967105f8621d73cafa1f6204c2f6bbba82505 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/expressions/ParameterExpressionViewFactor.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/expressions/ParameterExpressionViewFactor.java
@@ -35,7 +35,6 @@ public class ParameterExpressionViewFactor implements IExpressionViewFactor {
         final String equation = data.get("equation") != null ? (String)data.get("equation") : "";\r
         \r
         \r
-        GridDataFactory.fillDefaults().grab(true, true).applyTo(parent);\r
         GridLayoutFactory.fillDefaults().numColumns(2).spacing(3, 3).applyTo(parent);\r
         equationLabel = new Label(parent, SWT.NONE);\r
         equationLabel.setFont(FONT);\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/expressions/StockExpressionViewFactor.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/expressions/StockExpressionViewFactor.java
index 4070348b86f766b2b9f0d708c76076900f5e6773..ac483c0b0850cd54dcf8c2181e464a7a90b7b953 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/expressions/StockExpressionViewFactor.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/expressions/StockExpressionViewFactor.java
@@ -38,7 +38,6 @@ public class StockExpressionViewFactor implements IExpressionViewFactor {
         final String initialEquation = data.get("initialEquation") != null ? (String)data.get("initialEquation") : "";\r
         final String integralEquation = data.get("integral") != null ? (String)data.get("integral") : "";\r
         \r
-        GridDataFactory.fillDefaults().grab(true, true).applyTo(parent);\r
         GridLayoutFactory.fillDefaults().numColumns(2).spacing(3, 3).applyTo(parent);\r
 \r
         integralLabel = new Label(parent, SWT.NONE);\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/expressions/WithLookupExpressionViewFactor.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/expressions/WithLookupExpressionViewFactor.java
index e9b9e0aec2be2c2085607a0fd3e55efec4140576..80e934fc5a5a392a36c68e7e95dc0ab41e26d5b5 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/expressions/WithLookupExpressionViewFactor.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/expressions/WithLookupExpressionViewFactor.java
@@ -39,7 +39,6 @@ public class WithLookupExpressionViewFactor implements IExpressionViewFactor {
         final String equation = data.get("equation") != null ? (String)data.get("equation") : "";\r
         final String lookupTable = data.get("lookup") != null ? (String)data.get("lookup") : "";\r
         \r
-        GridDataFactory.fillDefaults().grab(true, true).applyTo(parent);\r
         GridLayoutFactory.fillDefaults().numColumns(2).spacing(3, 3).applyTo(parent);\r
 \r
         expressionLabel = new Label(parent, SWT.NONE);\r