From a88d76607824bf99d6a5121353f2998c6fb7ac90 Mon Sep 17 00:00:00 2001
From: hengsin <hengsin@gmail.com>
Date: Wed, 22 Jul 2020 20:27:51 +0800
Subject: [PATCH] Idempiere 4374 (#178)

* IDEMPIERE-4374 CSS Field Style not working for WSearchEditor

fix css field style not working for WSearchEditor

* IDEMPIERE-4374 CSS Field Style not working for WSearchEditor

fix css
---
 .../src/org/adempiere/webui/editor/WEditor.java  |  7 +++++++
 .../default/css/fragment/field-editor.css.dsp    | 16 ++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java
index f9e014e64e..5e6122e85b 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java
@@ -29,6 +29,7 @@ import org.adempiere.webui.LayoutUtils;
 import org.adempiere.webui.adwindow.IFieldEditorContainer;
 import org.adempiere.webui.component.Bandbox;
 import org.adempiere.webui.component.Button;
+import org.adempiere.webui.component.ComboEditorBox;
 import org.adempiere.webui.component.Datebox;
 import org.adempiere.webui.component.DatetimeBox;
 import org.adempiere.webui.component.EditorBox;
@@ -641,17 +642,23 @@ public abstract class WEditor implements EventListener<Event>, PropertyChangeLis
 			String sclass = style.substring(MStyle.SCLASS_PREFIX.length());
 			if (component instanceof EditorBox)
 				((EditorBox)component).getTextbox().setSclass(sclass);
+			else if (component instanceof ComboEditorBox)
+				((ComboEditorBox)component).getCombobox().setSclass(sclass);
 			else
 				component.setSclass(sclass);
 		} else if (style != null && style.startsWith(MStyle.ZCLASS_PREFIX)) {
 			String zclass = style.substring(MStyle.ZCLASS_PREFIX.length());
 			if (component instanceof EditorBox)
 				((EditorBox)component).getTextbox().setZclass(zclass);
+			else if (component instanceof ComboEditorBox)
+				((ComboEditorBox)component).getCombobox().setZclass(zclass);
 			else
 				component.setZclass(zclass);
 		} else {
 			if (component instanceof EditorBox)
 				((EditorBox)component).getTextbox().setStyle(style);
+			else if (component instanceof ComboEditorBox)
+				((ComboEditorBox)component).getCombobox().setStyle(style);
 			else
 				component.setStyle(style);
 		}
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/field-editor.css.dsp b/org.adempiere.ui.zk/theme/default/css/fragment/field-editor.css.dsp
index 9db8e10ba0..e6094258eb 100644
--- a/org.adempiere.ui.zk/theme/default/css/fragment/field-editor.css.dsp
+++ b/org.adempiere.ui.zk/theme/default/css/fragment/field-editor.css.dsp
@@ -123,6 +123,22 @@ span.grid-combobox-editor {
 	border-left: 1px solid #0000ff;
 }
 
+.editor-input.z-combobox + .editor-button {
+	background-color: #F7F7F7;
+	width: 22px;
+    height: 24px;
+    min-height: 24px;
+    right: 0px;
+    top: 1px;
+    border: 1px solid #CFCFCF;
+    border-radius: 0;
+    border-left: 1px solid transparent;
+}
+.editor-input.z-combobox > .z-combobox-input {
+	border-bottom-right-radius: 0;
+	border-top-right-radius: 0;
+}
+
 <%-- payment rule --%>
 .payment-rule-editor {
 	display: inline-block;