angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-11 14:37:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tree: Fixed missing custom closed/opened/leaf icons of a custom DefaultTreeCellRenderer. (issue #653; regression since implementing PR #609 in FlatLaf 3.0)

Browse Source
This commit is contained in:
Karl Tauber
2023-03-02 23:06:35 +01:00
parent 465798ee3d
commit 2f5c54bb49
4 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTreeUI.java
View File

@@ -158,6 +158,10 @@ public class FlatTreeUI
// only used via styling (not in UI defaults, but has likewise client properties)
/** @since 2 */ @Styleable protected boolean paintSelection = true;
private Icon defaultLeafIcon;
private Icon defaultClosedIcon;
private Icon defaultOpenIcon;
private boolean paintLines;
private Color defaultCellNonSelectionBackground;
private Color defaultSelectionBackground;
@@ -193,6 +197,10 @@ public class FlatTreeUI
showCellFocusIndicator = UIManager.getBoolean( "Tree.showCellFocusIndicator" );
showDefaultIcons = UIManager.getBoolean( "Tree.showDefaultIcons" );
defaultLeafIcon = UIManager.getIcon( "Tree.leafIcon" );
defaultClosedIcon = UIManager.getIcon( "Tree.closedIcon" );
defaultOpenIcon = UIManager.getIcon( "Tree.openIcon" );
paintLines = UIManager.getBoolean( "Tree.paintLines" );
defaultCellNonSelectionBackground = UIManager.getColor( "Tree.textBackground" );
defaultSelectionBackground = selectionBackground;
@@ -219,6 +227,10 @@ public class FlatTreeUI
selectionInactiveForeground = null;
selectionBorderColor = null;
defaultLeafIcon = null;
defaultClosedIcon = null;
defaultOpenIcon = null;
defaultCellNonSelectionBackground = null;
defaultSelectionBackground = null;
defaultSelectionForeground = null;
@@ -233,9 +245,14 @@ public class FlatTreeUI
// remove default leaf/closed/opened icons
if( !showDefaultIcons && currentCellRenderer instanceof DefaultTreeCellRenderer ) {
DefaultTreeCellRenderer renderer = (DefaultTreeCellRenderer) currentCellRenderer;
renderer.setLeafIcon( null );
renderer.setClosedIcon( null );
renderer.setOpenIcon( null );
if( renderer.getLeafIcon() == defaultLeafIcon &&
renderer.getClosedIcon() == defaultClosedIcon &&
renderer.getOpenIcon() == defaultOpenIcon )
{
renderer.setLeafIcon( null );
renderer.setClosedIcon( null );
renderer.setOpenIcon( null );
}
}
}