diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index c826c2b..3b12138 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,6 +4,9 @@
+
+ uses
+
diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java
index e9bbf91..82cc711 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java
@@ -14,14 +14,15 @@ import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
+import com.google.gwt.event.logical.shared.ResizeEvent;
+import com.google.gwt.event.logical.shared.ResizeHandler;
+import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.RootPanel;
import com.google.gwt.user.client.ui.Widget;
import com.google.web.bindery.event.shared.EventBus;
import com.sencha.gxt.core.client.util.Margins;
import com.sencha.gxt.widget.core.client.ContentPanel;
-import com.sencha.gxt.widget.core.client.Portlet;
import com.sencha.gxt.widget.core.client.TabPanel;
-import com.sencha.gxt.widget.core.client.button.ToolButton;
import com.sencha.gxt.widget.core.client.container.BorderLayoutContainer;
import com.sencha.gxt.widget.core.client.container.BorderLayoutContainer.BorderLayoutData;
import com.sencha.gxt.widget.core.client.container.MarginData;
@@ -52,10 +53,11 @@ public class TabularDataPortlet implements EntryPoint {
@SuppressWarnings("unused")
private final TabularDataServiceAsync greetingService = GWT.create(TabularDataService.class);
+ //Main Panel
+ private static SimpleContainer mainPanel;
+
//Private TabularData
private static TabularData tabularData;
-
-
private static ContentPanel functionalityPanel;
private static TabPanel functionalityTab;
private static BorderLayoutData eastData;
@@ -79,11 +81,54 @@ public class TabularDataPortlet implements EntryPoint {
loadMainPanel();
}
});
+
}
+
+ /**
+ * Update window size
+ */
+ public void updateSize(){
+
+ RootPanel workspace = RootPanel.get("tdp");
+
+ int topBorder = workspace.getAbsoluteTop();
+
+ int leftBorder = workspace.getAbsoluteLeft();
+
+ int footer = 85;
+
+ int rootHeight = (Window.getClientHeight() - topBorder - 4 - footer);// - ((footer == null)?0:(footer.getOffsetHeight()-15));
+
+ if (rootHeight < 550)
+ rootHeight = 550;
+
+ int rootWidth = Window.getClientWidth() - 2* leftBorder; //- rightScrollBar;
+
+ System.out.println("New workspace dimension Height: "+rootHeight+" Width: "+rootWidth);
+
+ mainPanel.setHeight(rootHeight);
+ mainPanel.setWidth(rootWidth);
+ }
+
+
+
protected void loadMainPanel() {
+ Window.addResizeHandler(new ResizeHandler() {
+
+ @Override
+ public void onResize(ResizeEvent event) {
+ System.out.println("onWindowResized width: "+event.getWidth()+" height: "+event.getHeight());
+ updateSize();
+
+ }
+ });
+
+
+
+
TabularDataController controller = new TabularDataController();
EventBus eventBus = controller.getEventBus();
@@ -102,9 +147,7 @@ public class TabularDataPortlet implements EntryPoint {
//Layout
final BorderLayoutContainer mainPanelLayout = new BorderLayoutContainer();
mainPanelLayout.setBorders(true);
-
-
-
+
//Ribbon Menu
TabularDataRibbon tabularDataTooBar = new TabularDataRibbon(eventBus);
Widget toolBarPanel = tabularDataTooBar.getContainer();
@@ -158,9 +201,11 @@ public class TabularDataPortlet implements EntryPoint {
controller.setEastData(eastData);
//Main
- SimpleContainer mainPanel = new SimpleContainer();
+ mainPanel = new SimpleContainer();
mainPanel.add(mainPanelLayout);
+ updateSize();
bind(mainPanel);
+
}
protected void bind(Widget mainWidget)
@@ -181,12 +226,12 @@ public class TabularDataPortlet implements EntryPoint {
}
}
- private void configPanel(final Portlet panel) {
+ /*private void configPanel(final Portlet panel) {
panel.setCollapsible(true);
panel.setAnimCollapse(false);
//panel.getHeader().addTool(new ToolButton(ToolButton.GEAR));
panel.getHeader().addTool(new ToolButton(ToolButton.CLOSE));
- }
+ }*/
}
diff --git a/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml
index 26a5e98..7b88dfe 100644
--- a/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml
@@ -17,7 +17,8 @@
-
+
+
diff --git a/src/main/webapp/TabularDataPortlet.html b/src/main/webapp/TabularDataPortlet.html
index 732f485..1441c3f 100644
--- a/src/main/webapp/TabularDataPortlet.html
+++ b/src/main/webapp/TabularDataPortlet.html
@@ -42,8 +42,8 @@
in order for this application to display correctly.
-
+
+