midsuit
/
core-jgi
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-5318 DetailPane ignore IAction.getIconSclass (#1367)

This commit is contained in:
hengsin 2022-06-16 01:09:03 +08:00 committed by GitHub
parent 71b97d7a40
commit a335d97eb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/DetailPane.java
View File

@ -471,13 +471,23 @@ public class DetailPane extends Panel implements EventListener<Event>, IdSpace {
btn.setId("Btn"+toolbarButton.getComponentName()); btn.setId("Btn"+toolbarButton.getComponentName());
btn.setTooltiptext(tooltiptext); btn.setTooltiptext(tooltiptext);
btn.setDisabled(false); btn.setDisabled(false);
btn.setIconSclass(null);
AImage aImage = Actions.getActionImage(actionId); if (ThemeManager.isUseFontIconForImage()) {
if ( aImage != null ) { String iconSclass = Actions.getActionIconSclass(actionId);
btn.setImageContent(aImage); if (!Util.isEmpty(iconSclass, true)) {
} else { btn.setIconSclass(iconSclass);
btn.setLabel(label); 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()); ToolbarCustomButton toolbarCustomBtn = new ToolbarCustomButton(toolbarButton, btn, actionId, tabPanel.getGridTab().getWindowNo(), tabPanel.getGridTab().getTabNo());
tp.toolbarCustomButtons.put(btn, toolbarCustomBtn); tp.toolbarCustomButtons.put(btn, toolbarCustomBtn);