From cdead096cf3ce38b0f09ebb64257cb94cb60a09a Mon Sep 17 00:00:00 2001 From: Elaine Tan Date: Wed, 3 Jul 2013 11:19:05 +0800 Subject: [PATCH 1/2] IDEMPIERE-1130 Problem with the height of performance dashboard panel --- .../WEB-INF/src/org/adempiere/webui/apps/graph/WPAPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WPAPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WPAPanel.java index 3c634120d7..80cd9a458d 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WPAPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WPAPanel.java @@ -67,7 +67,7 @@ public class WPAPanel extends Panel implements EventListener Grid grid = new Grid(); appendChild(grid); int gh = options != null && options.chartHeight > 0 ? options.chartHeight+60 : 180; - grid.setHeight(m_goals.length * gh / 2 + "px"); + grid.setHeight((m_goals.length + (m_goals.length % 2)) * gh / 2 + "px"); grid.makeNoStrip(); Rows rows = new Rows(); From a0a5caa279f4ab423a7bb09f102b98123af3bfe4 Mon Sep 17 00:00:00 2001 From: Elaine Tan Date: Wed, 3 Jul 2013 13:50:57 +0800 Subject: [PATCH 2/2] IDEMPIERE-724 Zk: Make iDempiere theme more easily customizable - Fix locator and location popups. Required fixed popup height for ZK to auto adjust the position based on available space. --- .../src/org/adempiere/webui/window/WLocationDialog.java | 3 ++- .../WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java index 4e6a735ac9..43ef6850e8 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java @@ -190,6 +190,7 @@ public class WLocationDialog extends Window implements EventListener initLocation(); // this.setWidth("350px"); + this.setHeight("360px"); // required fixed height for ZK to auto adjust the position based on available space this.setSclass("popup-dialog"); this.setClosable(true); this.setBorder("normal"); @@ -336,7 +337,7 @@ public class WLocationDialog extends Window implements EventListener Borderlayout borderlayout = new Borderlayout(); this.appendChild(borderlayout); borderlayout.setHflex("1"); - borderlayout.setVflex("min"); + borderlayout.setVflex("1"); Center centerPane = new Center(); centerPane.setSclass("dialog-content"); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java index 4537ed58cc..fa7645c51e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java @@ -232,7 +232,7 @@ public class WLocatorDialog extends Window implements EventListener Borderlayout borderlayout = new Borderlayout(); this.appendChild(borderlayout); borderlayout.setHflex("1"); - borderlayout.setVflex("min"); + borderlayout.setVflex("1"); Center centerPane = new Center(); centerPane.setSclass("dialog-content"); @@ -252,6 +252,7 @@ public class WLocatorDialog extends Window implements EventListener this.setClosable(true); this.setBorder("normal"); this.setWidth("260px"); + this.setHeight("300px"); // required fixed height for ZK to auto adjust the position based on available space this.setShadow(true); this.setAttribute(Window.MODE_KEY, Window.MODE_HIGHLIGHTED); this.setSizable(true); // Elaine 2009/02/02 - window set to resizable