From a335d97eb1a1b433bf4f5787e9ec2bc276e530c5 Mon Sep 17 00:00:00 2001 From: hengsin Date: Thu, 16 Jun 2022 01:09:03 +0800 Subject: [PATCH] IDEMPIERE-5318 DetailPane ignore IAction.getIconSclass (#1367) --- .../adempiere/webui/adwindow/DetailPane.java | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/DetailPane.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/DetailPane.java index f57b7a8e81..ce830e345c 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/DetailPane.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/DetailPane.java @@ -471,13 +471,23 @@ public class DetailPane extends Panel implements EventListener, IdSpace { btn.setId("Btn"+toolbarButton.getComponentName()); btn.setTooltiptext(tooltiptext); btn.setDisabled(false); - - AImage aImage = Actions.getActionImage(actionId); - if ( aImage != null ) { - btn.setImageContent(aImage); - } else { - btn.setLabel(label); - } + btn.setIconSclass(null); + if (ThemeManager.isUseFontIconForImage()) { + String iconSclass = Actions.getActionIconSclass(actionId); + if (!Util.isEmpty(iconSclass, true)) { + btn.setIconSclass(iconSclass); + LayoutUtils.addSclass("font-icon-toolbar-button", btn); + } + } + //not using font icon, fallback to image or label + if (Util.isEmpty(btn.getIconSclass(), true)) { + AImage aImage = Actions.getActionImage(actionId); + if ( aImage != null ) { + btn.setImageContent(aImage); + } else { + btn.setLabel(label); + } + } ToolbarCustomButton toolbarCustomBtn = new ToolbarCustomButton(toolbarButton, btn, actionId, tabPanel.getGridTab().getWindowNo(), tabPanel.getGridTab().getTabNo()); tp.toolbarCustomButtons.put(btn, toolbarCustomBtn);