From 0e123c5931b4ed8207b5d50fd3340638b525626b Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Mon, 22 Jun 2015 17:05:05 +0000 Subject: [PATCH] Fixed Layout git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@115475 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/MultiColumnExpressionPanel.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/MultiColumnExpressionPanel.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/MultiColumnExpressionPanel.java index bca47be..053bea7 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/MultiColumnExpressionPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/MultiColumnExpressionPanel.java @@ -53,11 +53,14 @@ import com.sencha.gxt.widget.core.client.form.validator.EmptyValidator; * */ public class MultiColumnExpressionPanel extends FramedPanel { + private static final String WIDTH = "929px"; private static final String HEIGHT = "352px"; + private static final String CONDITION_FIELD_WIDTH = "910px"; + private static final String ROWS_DELETE_HEIGHT = "388px"; private static final String RULE_HEIGHT= "312px"; - + private static final String RULE_MULTI_CONDITION_WIDTH = "890px"; private static final String RULE_MULTI_CONDITION_HEIGHT = "228px"; @@ -225,6 +228,7 @@ public class MultiColumnExpressionPanel extends FramedPanel { conditionsField = new FieldSet(); conditionsField.setHeadingText("Conditions"); conditionsField.setCollapsible(false); + conditionsField.setWidth(CONDITION_FIELD_WIDTH); conditionWidget = new ConditionOnMultiColumnWidget(columns,RULE_MULTI_CONDITION_WIDTH,RULE_MULTI_CONDITION_HEIGHT); conditionsField.add(conditionWidget); @@ -365,6 +369,7 @@ public class MultiColumnExpressionPanel extends FramedPanel { conditionsField = new FieldSet(); conditionsField.setHeadingText("Conditions"); conditionsField.setCollapsible(false); + conditionsField.setWidth(CONDITION_FIELD_WIDTH); conditionWidget = new ConditionOnMultiColumnWidget(columns); Log.debug("ConditionWidget" + conditionWidget); @@ -426,6 +431,7 @@ public class MultiColumnExpressionPanel extends FramedPanel { conditionsField = new FieldSet(); conditionsField.setHeadingText("Conditions"); conditionsField.setCollapsible(false); + conditionsField.setWidth(CONDITION_FIELD_WIDTH); conditionWidget = new ConditionOnMultiColumnWidget(columns); conditionsField.add(conditionWidget); @@ -482,7 +488,8 @@ public class MultiColumnExpressionPanel extends FramedPanel { conditionsField = new FieldSet(); conditionsField.setHeadingText("Conditions"); conditionsField.setCollapsible(false); - + conditionsField.setWidth(CONDITION_FIELD_WIDTH); + conditionWidget = new ConditionOnMultiColumnWidget(columns); Log.debug("ConditionWidget" + conditionWidget); conditionsField.add(conditionWidget);