diff --git a/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/TargetColumnsSelectionPanel.java b/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/TargetColumnsSelectionPanel.java index 9fa2d6f..0079b00 100644 --- a/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/TargetColumnsSelectionPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/TargetColumnsSelectionPanel.java @@ -29,17 +29,16 @@ import com.google.gwt.safehtml.shared.SafeHtmlUtils; import com.google.gwt.user.client.rpc.AsyncCallback; import com.sencha.gxt.cell.core.client.ButtonCell.IconAlign; 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.FramedPanel; import com.sencha.gxt.widget.core.client.button.TextButton; -import com.sencha.gxt.widget.core.client.container.HBoxLayoutContainer; -import com.sencha.gxt.widget.core.client.container.SimpleContainer; -import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer; import com.sencha.gxt.widget.core.client.container.BoxLayoutContainer.BoxLayoutData; import com.sencha.gxt.widget.core.client.container.BoxLayoutContainer.BoxLayoutPack; +import com.sencha.gxt.widget.core.client.container.HBoxLayoutContainer; import com.sencha.gxt.widget.core.client.container.HBoxLayoutContainer.HBoxLayoutAlign; +import com.sencha.gxt.widget.core.client.container.SimpleContainer; +import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer; import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData; import com.sencha.gxt.widget.core.client.event.SelectEvent; import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; @@ -67,8 +66,8 @@ public class TargetColumnsSelectionPanel extends FramedPanel implements protected static final String HEIGHT = "378px"; protected static final String FIELDWIDTH = "526px"; protected static final String FIELDSHEIGHT = "336px"; - protected static final int LABELSIZE = 128; - protected static final int COMBOWIDTH = 300; + protected static final int LABELSIZE = 120; + protected static final int COMBOWIDTH = 270; protected TargetColumnsSelectionCard parent; protected TabResource connection; @@ -148,7 +147,7 @@ public class TargetColumnsSelectionPanel extends FramedPanel implements form.setHeight(FIELDSHEIGHT); formLayout = new VerticalLayoutContainer(); - formLayout.setScrollMode(ScrollMode.AUTO); + //formLayout.setScrollMode(ScrollMode.AUTO); formLayout.setAdjustForScroll(true); ArrayList fields = generateFields(); @@ -160,8 +159,8 @@ public class TargetColumnsSelectionPanel extends FramedPanel implements form.add(formLayout); VerticalLayoutContainer v = new VerticalLayoutContainer(); - v.setHeight(HEIGHT); - v.setWidth(WIDTH); + //v.setHeight(HEIGHT); + //v.setWidth(WIDTH); v.add(toolBarHead, new VerticalLayoutData(1, -1, new Margins(0))); v.add(form, new VerticalLayoutData(1, -1, new Margins(0))); @@ -365,15 +364,16 @@ public class TargetColumnsSelectionPanel extends FramedPanel implements HBoxLayoutContainer flowButton = new HBoxLayoutContainer(); flowButton.setHBoxLayoutAlign(HBoxLayoutAlign.MIDDLE); flowButton.setPack(BoxLayoutPack.START); - - flowButton.add(checkNew, new BoxLayoutData(new Margins(2, 4, 2, 4))); - flowButton.add(comboColumn, new BoxLayoutData(new Margins(2, 4, 2, 4))); - flowButton.add(comboDefColumn, new BoxLayoutData( - new Margins(2, 4, 2, 4))); + + BoxLayoutData boxLayoutData=new BoxLayoutData(new Margins(2, 4, 2, 4)); + flowButton.add(checkNew, boxLayoutData); + flowButton.add(comboColumn, boxLayoutData); + flowButton.add(comboDefColumn, boxLayoutData); FieldLabel columnLabel = new FieldLabel(flowButton, label); columnLabel.setId(col.getColumnId()); comboDefColumn.setVisible(false); + return columnLabel; } @@ -469,7 +469,7 @@ public class TargetColumnsSelectionPanel extends FramedPanel implements protected void updatedForm() { form.clear(); formLayout = new VerticalLayoutContainer(); - formLayout.setScrollMode(ScrollMode.AUTO); + //formLayout.setScrollMode(ScrollMode.AUTO); formLayout.setAdjustForScroll(true); ArrayList fields = generateFields();