From: lempinen <lempinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Mon, 25 Jan 2010 16:29:01 +0000 (+0000)
Subject: Fix: Span is kept after resizing
X-Git-Tag: simantics-1.0~99
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=bbd857c0a23408a45a044702b9a89837e96c4d46;p=simantics%2Fsysdyn.git

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 0a6810a5..1ed9a965 100644
--- 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 {
 
         final String equation = data.get("equation") != null ? (String)data.get("equation") : "";
         
-        GridDataFactory.fillDefaults().grab(true, true).applyTo(parent);
         GridLayoutFactory.fillDefaults().numColumns(2).spacing(3, 3).applyTo(parent);
         equationLabel = new Label(parent, SWT.NONE);
         equationLabel.setFont(FONT);
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 def62261..3766a267 100644
--- 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 {
 
         final String equation = data.get("equation") != null ? (String)data.get("equation") : "";
 
-        GridDataFactory.fillDefaults().grab(true, true).applyTo(parent);
         GridLayoutFactory.fillDefaults().numColumns(2).spacing(3, 3).applyTo(parent);
         equationLabel = new Label(parent, SWT.NONE);
         equationLabel.setFont(FONT);
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 66a00b3a..0f896710 100644
--- 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") : "";
         
         
-        GridDataFactory.fillDefaults().grab(true, true).applyTo(parent);
         GridLayoutFactory.fillDefaults().numColumns(2).spacing(3, 3).applyTo(parent);
         equationLabel = new Label(parent, SWT.NONE);
         equationLabel.setFont(FONT);
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 4070348b..ac483c0b 100644
--- 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") : "";
         final String integralEquation = data.get("integral") != null ? (String)data.get("integral") : "";
         
-        GridDataFactory.fillDefaults().grab(true, true).applyTo(parent);
         GridLayoutFactory.fillDefaults().numColumns(2).spacing(3, 3).applyTo(parent);
 
         integralLabel = new Label(parent, SWT.NONE);
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 e9b9e0ae..80e934fc 100644
--- 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") : "";
         final String lookupTable = data.get("lookup") != null ? (String)data.get("lookup") : "";
         
-        GridDataFactory.fillDefaults().grab(true, true).applyTo(parent);
         GridLayoutFactory.fillDefaults().numColumns(2).spacing(3, 3).applyTo(parent);
 
         expressionLabel = new Label(parent, SWT.NONE);