gCubeSystem
/
tabular-data-expression-widget
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed Layout for GXT 3.1.1 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@101921 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-12-05 11:05:19 +00:00
parent 2b43716b1c
commit 3595fb9ce8
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionPanel.java
View File

@ -12,7 +12,6 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi
import com.allen_sauer.gwt.log.client.Log;
import com.google.web.bindery.event.shared.EventBus;
import com.sencha.gxt.cell.core.client.ButtonCell.IconAlign;
import com.sencha.gxt.core.client.dom.ScrollSupport.ScrollMode;
import com.sencha.gxt.core.client.util.Margins;
import com.sencha.gxt.widget.core.client.FramedPanel;
import com.sencha.gxt.widget.core.client.button.TextButton;
@ -118,7 +117,7 @@ public class ColumnExpressionPanel extends FramedPanel {
VerticalLayoutContainer basicLayout = new VerticalLayoutContainer();
basicLayout.setAdjustForScroll(true);
basicLayout.setScrollMode(ScrollMode.AUTO);
//basicLayout.setScrollMode(ScrollMode.AUTO); Set In GXT 3.0.1
FieldSet properties = null;
VerticalLayoutContainer propertiesLayout;
@ -313,11 +312,11 @@ public class ColumnExpressionPanel extends FramedPanel {
break;
}
basicLayout.add(properties, new VerticalLayoutData(-1, -1, new Margins(
basicLayout.add(properties, new VerticalLayoutData(1, -1, new Margins(
1)));
basicLayout.add(conditionsField, new VerticalLayoutData(-1, -1,
basicLayout.add(conditionsField, new VerticalLayoutData(1, -1,
new Margins(1)));
basicLayout.add(flowButton, new VerticalLayoutData(-1, 36, new Margins(
basicLayout.add(flowButton, new VerticalLayoutData(1, 36, new Margins(
5, 2, 5, 2)));
add(basicLayout);

3
src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ConditionWidget.java
View File

@ -27,7 +27,6 @@ import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Widget;
import com.sencha.gxt.cell.core.client.form.ComboBoxCell.TriggerAction;
import com.sencha.gxt.core.client.dom.ScrollSupport.ScrollMode;
import com.sencha.gxt.core.client.util.Margins;
import com.sencha.gxt.core.client.util.ToggleGroup;
import com.sencha.gxt.data.shared.ListStore;
@ -123,7 +122,7 @@ public class ConditionWidget extends SimpleContainer {
groupMatch.setValue(radioAll);
vert = new VerticalLayoutContainer();
vert.setScrollMode(ScrollMode.AUTO);
//vert.setScrollMode(ScrollMode.AUTO); Set In GXT 3.0.1
vert.setAdjustForScroll(true);
setup();

11
src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionPanel.java
View File

@ -28,7 +28,6 @@ import com.google.gwt.user.client.ui.HasValue;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.web.bindery.event.shared.EventBus;
import com.sencha.gxt.cell.core.client.ButtonCell.IconAlign;
import com.sencha.gxt.core.client.dom.ScrollSupport.ScrollMode;
import com.sencha.gxt.core.client.util.Margins;
import com.sencha.gxt.core.client.util.ToggleGroup;
import com.sencha.gxt.widget.core.client.FramedPanel;
@ -145,7 +144,7 @@ public class ReplaceColumnByExpressionPanel extends FramedPanel {
protected void create() {
VerticalLayoutContainer basicLayout = new VerticalLayoutContainer();
basicLayout.setAdjustForScroll(true);
basicLayout.setScrollMode(ScrollMode.AUTO);
//basicLayout.setScrollMode(ScrollMode.AUTO);
HBoxLayoutContainer flowButton = new HBoxLayoutContainer();
flowButton.setHBoxLayoutAlign(HBoxLayoutAlign.MIDDLE);
@ -295,14 +294,14 @@ public class ReplaceColumnByExpressionPanel extends FramedPanel {
flowButton.add(btnClose, new BoxLayoutData(new Margins(2, 4, 2, 4)));
// Add to basic layout
basicLayout.add(properties, new VerticalLayoutData(-1, -1, new Margins(
basicLayout.add(properties, new VerticalLayoutData(1, -1, new Margins(
1)));
basicLayout.add(conditionsFieldSet, new VerticalLayoutData(-1, -1,
basicLayout.add(conditionsFieldSet, new VerticalLayoutData(1, -1,
new Margins(1)));
basicLayout.add(replaceValueFieldSet, new VerticalLayoutData(-1, -1,
basicLayout.add(replaceValueFieldSet, new VerticalLayoutData(1, -1,
new Margins(1)));
basicLayout.add(flowButton, new VerticalLayoutData(-1, 36, new Margins(
basicLayout.add(flowButton, new VerticalLayoutData(1, 36, new Margins(
5, 2, 5, 2)));
add(basicLayout);

3
src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceWidget.java
View File

@ -28,7 +28,6 @@ import com.google.gwt.event.logical.shared.SelectionHandler;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.web.bindery.event.shared.EventBus;
import com.sencha.gxt.cell.core.client.form.ComboBoxCell.TriggerAction;
import com.sencha.gxt.core.client.dom.ScrollSupport.ScrollMode;
import com.sencha.gxt.core.client.util.Margins;
import com.sencha.gxt.data.shared.ListStore;
import com.sencha.gxt.widget.core.client.container.BoxLayoutContainer.BoxLayoutData;
@ -212,7 +211,7 @@ public class ReplaceWidget extends SimpleContainer {
itemIdHoriz = "Horiz" + trId.getId();
vert = new VerticalLayoutContainer();
vert.setScrollMode(ScrollMode.AUTO);
//vert.setScrollMode(ScrollMode.AUTO); Set in GXT 3.0.1
final HBoxLayoutContainer horiz = new HBoxLayoutContainer();