From ae06e74778aed14f53eaf540edb0e23ab5c6da12 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Wed, 18 Mar 2015 16:34:38 +0000 Subject: [PATCH] fixed balloon git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/gis-viewer-app@113650 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/ApplicationController.java | 17 ++++------------- .../user/gisviewerapp/client/GisViewerApp.java | 7 +------ 2 files changed, 5 insertions(+), 19 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 d1ac322..dd851a3 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 @@ -187,21 +187,12 @@ public class ApplicationController implements WmsDialogHandler{ } /** - * Sets the new position. - * - * @param scrollTop the scroll top - * @param left the left - * @param height the height + * */ - public void setWMSBalloonPosition(int scrollTop, int left, int height){ -// GWT.log("height: "+height +" scrollTop: "+scrollTop); - scrollTop= scrollTop>0?scrollTop:1; - height = height>0?height:1; - int newPosition = scrollTop+height; -// GWT.log("new position: "+newPosition); + public void moveWMSBalloonPosition(){ + baloonWMS.hide(); baloonWMS.setVisible(false); - baloonWMS.show(); - baloonWMS.setPopupPosition(left>0?left:1, newPosition-35); + baloonWMS.showRelativeTo(lcWMS); baloonWMS.setVisible(true); } diff --git a/src/main/java/org/gcube/portlets/user/gisviewerapp/client/GisViewerApp.java b/src/main/java/org/gcube/portlets/user/gisviewerapp/client/GisViewerApp.java index a7b431e..ee9b8fa 100644 --- a/src/main/java/org/gcube/portlets/user/gisviewerapp/client/GisViewerApp.java +++ b/src/main/java/org/gcube/portlets/user/gisviewerapp/client/GisViewerApp.java @@ -106,12 +106,7 @@ public class GisViewerApp implements EntryPoint { appController.getMainPanel().setHeight(rootHeight); appController.getMainPanel().setWidth(rootWidth); - appController.getBaloonWMS().hide(); - int scroll = Window.getScrollTop(); - int left = Window.getScrollLeft(); - int height = Window.getClientHeight(); -// GWT.log("onResize height: "+Window.getClientHeight()); - appController.setWMSBalloonPosition(scroll, left, height); + appController.moveWMSBalloonPosition(); // appController.getGisViewerPanel().getOpenLayersMap().centerMapCurrentZoom(); }