Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-07 06:20:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

FlatSVGIcon: if icon has color filter and did change the color, then do not apply global color filter

Browse Source
This commit is contained in:
Karl Tauber
2021-04-16 23:25:22 +02:00
parent 34861166e8
commit ec2fccbb0e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGIcon.java
View File

@@ -702,10 +702,14 @@ public class FlatSVGIcon
} }
private Color filterColor( Color color ) { private Color filterColor( Color color ) {
if( colorFilter != null ) if( colorFilter != null ) {
color = colorFilter.filter( color ); Color newColor = colorFilter.filter( color );
if( globalColorFilter != null ) color = (newColor != color)
? newColor
: globalColorFilter.filter( color );
} else
color = globalColorFilter.filter( color ); color = globalColorFilter.filter( color );
if( grayFilter != null ) { if( grayFilter != null ) {
int oldRGB = color.getRGB(); int oldRGB = color.getRGB();
int newRGB = grayFilter.filterRGB( 0, 0, oldRGB ); int newRGB = grayFilter.filterRGB( 0, 0, oldRGB );