From 237df8203c7cd39e34a7405532f073fe2d56adf4 Mon Sep 17 00:00:00 2001 From: hengsin Date: Tue, 27 Oct 2020 07:19:30 +0800 Subject: [PATCH] IDEMPIERE-4509 Grid View Horizontal scrolling is not working well (#323) Disable the use of Frozen --- .../WEB-INF/src/org/adempiere/webui/adwindow/GridView.java | 5 ++++- .../theme/default/css/fragment/adwindow.css.dsp | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java index 59bcc061de..6fdfba7c25 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java @@ -60,7 +60,6 @@ import org.zkoss.zk.ui.util.Clients; import org.zkoss.zul.Cell; import org.zkoss.zul.Column; import org.zkoss.zul.Div; -import org.zkoss.zul.Frozen; import org.zkoss.zul.Paging; import org.zkoss.zul.Row; import org.zkoss.zul.Tabpanel; @@ -529,6 +528,9 @@ public class GridView extends Vlayout implements EventListener, IdSpace, Columns columns = new Columns(); //frozen not working well on tablet devices yet + //frozen is implemented poorly on zk ce, not working with scroll and white-space wrap + //unlikely to be fixed since the working 'smooth scrolling frozen' is a zk ee only feature + /* if (!ClientInfo.isMobile()) { Frozen frozen = new Frozen(); @@ -536,6 +538,7 @@ public class GridView extends Vlayout implements EventListener, IdSpace, frozen.setColumns(2); listbox.appendChild(frozen); } + */ org.zkoss.zul.Column selection = new Column(); selection.setHeight("2em"); diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/adwindow.css.dsp b/org.adempiere.ui.zk/theme/default/css/fragment/adwindow.css.dsp index b1185cd570..be02ed4c26 100644 --- a/org.adempiere.ui.zk/theme/default/css/fragment/adwindow.css.dsp +++ b/org.adempiere.ui.zk/theme/default/css/fragment/adwindow.css.dsp @@ -338,13 +338,13 @@ @media only screen and (max-device-width: 700px) { - .adtab-grid > .z-cell > .z-label { + .mobile .adtab-grid > .z-cell > .z-label { white-space: pre-line; } } .adtab-grid > .z-grid-header > table > tbody > tr.z-columns > th.z-column > .z-column-content { - white-space: pre-wrap; text-overflow: ellipsis; + white-space: pre-line; } .mobile-overflow-link {