From 51bc0404e7133a3a1944aa1440ff542e55283a8c Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Wed, 26 Nov 2014 16:35:11 +0000 Subject: [PATCH] updated code to dataPanelOpen git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/gis-viewer-app@101715 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/ApplicationController.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/gisviewerapp/client/ApplicationController.java b/src/main/java/org/gcube/portlets/user/gisviewerapp/client/ApplicationController.java index 5b1c7ed..96fd971 100644 --- a/src/main/java/org/gcube/portlets/user/gisviewerapp/client/ApplicationController.java +++ b/src/main/java/org/gcube/portlets/user/gisviewerapp/client/ApplicationController.java @@ -5,6 +5,7 @@ package org.gcube.portlets.user.gisviewerapp.client; import java.util.logging.Level; +import org.gcube.portlets.user.gisviewer.client.Constants; import org.gcube.portlets.user.gisviewer.client.DataPanelOpenListener; import org.gcube.portlets.user.gisviewer.client.GisViewerPanel; import org.gcube.portlets.user.gisviewer.client.GisViewerParameters; @@ -54,9 +55,22 @@ public class ApplicationController { gisViewerParameters.setDataPanelOpenListener(new DataPanelOpenListener() { @Override public void dataPanelOpen(boolean isOpen, int panelHeight) { - int gisViewerHeight = gisViewerContentPanel.getHeight()+ (isOpen ? panelHeight-24 : -panelHeight+24); - ConstantGisViewerApp.logger.log(Level.INFO, "Set heigth: "+gisViewerHeight); +// OLD CODE +// int gisViewerHeight = gisViewerContentPanel.getHeight()+ (isOpen ? panelHeight-24 : -panelHeight+24); +// ConstantGisViewerApp.logger.log(Level.INFO, "Set heigth: "+gisViewerHeight); +// gisViewerContentPanel.setHeight(gisViewerHeight); + + int dataPanelHeight = isOpen ? panelHeight+24 : 24; + int gisViewerHeight; + + if(gisViewerContentPanel.getHeight()>Constants.minGisViewerHeight) + gisViewerHeight = gisViewerContentPanel.getHeight(); + else + gisViewerHeight = Constants.minGisViewerHeight+dataPanelHeight; + gisViewerContentPanel.setHeight(gisViewerHeight); + + } });