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

UIDefaultsDump: output base color used for resolving derived color

Browse Source
This commit is contained in:
Karl Tauber
2022-01-03 18:46:56 +01:00
parent 5c4706cbc9
commit 8c891c7016
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsDump.java
View File

@@ -458,12 +458,14 @@ public class UIDefaultsDump
}
private void dumpColor( PrintWriter out, String key, Color color ) {
Color resolvedColor = resolveDerivedColor( key, color );
Color[] retBaseColor = new Color[1];
Color resolvedColor = resolveDerivedColor( key, color, retBaseColor );
if( resolvedColor != color && resolvedColor.getRGB() != color.getRGB() ) {
if( !isIntelliJTheme ) {
System.err.println( "Key '" + key + "': derived colors not equal" );
System.err.println( " Default color: " + dumpColorHexAndHSL( color ) );
System.err.println( " Resolved color: " + dumpColorHexAndHSL( resolvedColor ) );
System.err.println( " Default color: " + dumpColorHexAndHSL( color ) );
System.err.println( " Resolved color: " + dumpColorHexAndHSL( resolvedColor ) );
System.err.println( " Base of resolved color: " + dumpColorHexAndHSL( retBaseColor[0] ) );
}
out.printf( "%s / ",
@@ -672,7 +674,7 @@ public class UIDefaultsDump
return properties;
}
private Color resolveDerivedColor( String key, Color color ) {
private Color resolveDerivedColor( String key, Color color, Color[] retBaseColor ) {
if( !(color instanceof DerivedColor) )
return color;
@@ -693,7 +695,9 @@ public class UIDefaultsDump
throw new IllegalStateException( "Missing base color '" + baseKey + "' for key '" + key + "'." );
if( baseColor instanceof DerivedColor )
baseColor = resolveDerivedColor( (String) baseKey, baseColor );
baseColor = resolveDerivedColor( (String) baseKey, baseColor, retBaseColor );
retBaseColor[0] = baseColor;
Color newColor = FlatUIUtils.deriveColor( color, baseColor );