From 1b88546a84522e650268af7b3a1bf8c3ce39d26d Mon Sep 17 00:00:00 2001
From: Nicolas Micoud <nmicoud@tgi.fr>
Date: Sun, 11 Nov 2018 18:34:41 -0200
Subject: [PATCH] IDEMPIERE-3767 WReportCustomization / Tabs 1 and 5 are not
 scrollable

---
 .../webui/panel/WRC1DisplayFieldsPanel.java       | 15 ++++++++++++---
 .../webui/panel/WRC5SummaryFieldsPanel.java       | 13 +++++++++++--
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC1DisplayFieldsPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC1DisplayFieldsPanel.java
index b610c605f7..9fef2a3971 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC1DisplayFieldsPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC1DisplayFieldsPanel.java
@@ -14,6 +14,7 @@
 
 package org.adempiere.webui.panel;
 
+import org.adempiere.webui.component.Borderlayout;
 import org.adempiere.webui.component.Checkbox;
 import org.adempiere.webui.component.Column;
 import org.adempiere.webui.component.Columns;
@@ -30,6 +31,7 @@ import org.compiere.util.Util;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
+import org.zkoss.zul.Center;
 import org.zkoss.zul.Div;
 
 
@@ -38,7 +40,7 @@ public class WRC1DisplayFieldsPanel extends WRCTabPanel implements EventListener
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -2097631726230470398L;
+	private static final long serialVersionUID = -4595966853507636969L;
 
 	private static final int RENDER_IN_COLUMNS=4;
 	private MPrintFormat m_printFormat;
@@ -60,7 +62,7 @@ public class WRC1DisplayFieldsPanel extends WRCTabPanel implements EventListener
 	}
 
 	public void init() {
-		
+
 		m_chkboxes = new Checkbox[m_pfi.size()];
 		m_textBoxes = new Textbox[m_pfi.size()];
 		m_oldLabel = new String[m_pfi.size()];
@@ -70,6 +72,13 @@ public class WRC1DisplayFieldsPanel extends WRCTabPanel implements EventListener
 		ZKUpdateUtil.setHeight(wind, "100%");
 		ZKUpdateUtil.setHflex(wind, "1");
 		
+		Borderlayout borderlayout = new Borderlayout();
+		wind.appendChild(borderlayout);
+		ZKUpdateUtil.setHflex(borderlayout, "1");
+		Center center = new Center();
+		center.setAutoscroll(true);
+		borderlayout.appendChild(center);
+		
 		Grid grid = new Grid();
         //have problem moving the following out as css class
 		ZKUpdateUtil.setHflex(grid, "1");
@@ -81,7 +90,7 @@ public class WRC1DisplayFieldsPanel extends WRCTabPanel implements EventListener
         Div div = new Div();
 		div.setStyle("width:90%;height:100%;border:none;margin:none;padding:none");
 		div.appendChild(grid);
-		wind.appendChild(div);
+		center.appendChild(div);
 		this.appendChild(wind);
 		
 		Columns columns = new Columns();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC5SummaryFieldsPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC5SummaryFieldsPanel.java
index 26a08d52d3..469fbddb99 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC5SummaryFieldsPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC5SummaryFieldsPanel.java
@@ -15,6 +15,7 @@ package org.adempiere.webui.panel;
 
 import java.util.ArrayList;
 
+import org.adempiere.webui.component.Borderlayout;
 import org.adempiere.webui.component.Checkbox;
 import org.adempiere.webui.component.Column;
 import org.adempiere.webui.component.Columns;
@@ -29,6 +30,7 @@ import org.compiere.util.Msg;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
+import org.zkoss.zul.Center;
 import org.zkoss.zul.Div;
 import org.zkoss.zul.Row;
 
@@ -36,7 +38,7 @@ public class WRC5SummaryFieldsPanel extends WRCTabPanel implements EventListener
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -2231369601903381581L;
+	private static final long serialVersionUID = 4660623126634851224L;
 
 	private static final int RENDER_IN_COLUMNS=10;
 	Checkbox m_chkSum[]=null;
@@ -65,10 +67,17 @@ public class WRC5SummaryFieldsPanel extends WRCTabPanel implements EventListener
 		grid.setStyle("margin:0; padding:0; position: absolute");
 		grid.makeNoStrip();
 
+		Borderlayout borderlayout = new Borderlayout();
+		wind.appendChild(borderlayout);
+		ZKUpdateUtil.setHflex(borderlayout, "1");
+		Center center = new Center();
+		center.setAutoscroll(true);
+		borderlayout.appendChild(center);
+
 		Div div = new Div();
 		div.setStyle("width:90%;height:100%;border:none;margin:none;padding:none");
 		div.appendChild(grid);
-		wind.appendChild(div);
+		center.appendChild(div);
 		this.appendChild(wind);
 
 		Columns columns = new Columns();