From da83283d74700b03b9f83a3f3e1e8392d1c66316 Mon Sep 17 00:00:00 2001 From: Anozi Mada Date: Wed, 1 Jun 2022 13:01:33 +0700 Subject: [PATCH] IDEMPIERE-4739 Fix Height of HTML Text Editor not responsive (#1350) --- .../adempiere/webui/window/WEMailDialog.java | 23 +++++++++++++------ .../webui/window/WTextEditorDialog.java | 6 +++++ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java index 138b95ce4f..2ae8215e8f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java @@ -84,6 +84,7 @@ import org.zkoss.zul.Borderlayout; import org.zkoss.zul.Cell; import org.zkoss.zul.Center; import org.zkoss.zul.Div; +import org.zkoss.zul.North; import org.zkoss.zul.South; /** @@ -204,6 +205,8 @@ public class WEMailDialog extends Window implements EventListener, ValueC setAttachment(attachment); setAttribute(Window.MODE_KEY, Window.MODE_HIGHLIGHTED); addEventListener(Events.ON_CANCEL, e -> onCancel()); + addEventListener(Events.ON_SIZE, e -> onSize()); + addEventListener(Events.ON_MAXIMIZE, e -> onSize()); } // commonInit @@ -373,11 +376,8 @@ public class WEMailDialog extends Window implements EventListener, ValueC attachmentBox.appendChild(item); } - row = new Row(); - rows.appendChild(row); - row.appendCellChild(fMessage, 2); - fMessage.setHflex("2"); - fMessage.setHeight("350px"); + fMessage.setWidth("100%"); + fMessage.setHeight("100%"); confirmPanel.addActionListener(this); @@ -409,11 +409,16 @@ public class WEMailDialog extends Window implements EventListener, ValueC this.appendChild(borderlayout); ZKUpdateUtil.setWidth(borderlayout, "100%"); + North northPane = new North(); + northPane.setSclass("dialog-content"); + northPane.setAutoscroll(true); + borderlayout.appendChild(northPane); + northPane.appendChild(grid); + Center centerPane = new Center(); centerPane.setSclass("dialog-content"); - centerPane.setAutoscroll(true); borderlayout.appendChild(centerPane); - centerPane.appendChild(grid); + centerPane.appendChild(fMessage); South southPane = new South(); southPane.setSclass("dialog-footer"); @@ -622,6 +627,10 @@ public class WEMailDialog extends Window implements EventListener, ValueC private void onCancel() { onClose(); } + + private void onSize() { + fMessage.invalidate(); + } /** * @param dataSource diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java index eb096e4383..2279331888 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java @@ -186,6 +186,8 @@ public class WTextEditorDialog extends Window implements EventListener{ setSizable(true); setMaximizable(true); addEventListener(Events.ON_CANCEL, e -> onCancel()); + addEventListener(Events.ON_SIZE, e -> onSize()); + addEventListener(Events.ON_MAXIMIZE, e -> onSize()); } private void createEditor(org.zkoss.zul.Tabpanel tabPanel) { @@ -255,6 +257,10 @@ public class WTextEditorDialog extends Window implements EventListener{ detach(); } + private void onSize() { + editor.invalidate(); + } + private void updateStatus(int newLength) { if (status != null && maxSize > 0) { StringBuilder msg = new StringBuilder();