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

UIDefaultsDump: dump HSL color values

Browse Source
This commit is contained in:
Karl Tauber
2021-08-06 10:45:57 +02:00
parent 0544a605c3
commit bfb1642284
6 changed files with 1612 additions and 1587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
flatlaf-testing/dumps/uidefaults/FlatDarculaLaf_1.8.0_202.txt
View File

@@ -18,7 +18,7 @@
#---- CheckBox ----
- CheckBox.icon.focusedBackground #466d944d 30% javax.swing.plaf.ColorUIResource [UI]
- CheckBox.icon.focusedBackground #466d944d 30% HSLA 210 36 43 30 javax.swing.plaf.ColorUIResource [UI]
#---- ComboBox ----
@@ -71,11 +71,11 @@
#---- ProgressBar ----
- ProgressBar.foreground #4a88c7 javax.swing.plaf.ColorUIResource [UI]
+ ProgressBar.foreground #a0a0a0 javax.swing.plaf.ColorUIResource [UI]
- ProgressBar.foreground #4a88c7 HSL 210 53 54 javax.swing.plaf.ColorUIResource [UI]
+ ProgressBar.foreground #a0a0a0 HSL 0 0 63 javax.swing.plaf.ColorUIResource [UI]
- ProgressBar.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
+ ProgressBar.selectionForeground #3c3f41 javax.swing.plaf.ColorUIResource [UI]
- ProgressBar.selectionForeground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI]
+ ProgressBar.selectionForeground #3c3f41 HSL 204 4 25 javax.swing.plaf.ColorUIResource [UI]
#---- RadioButton ----

1024
flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt
View File

File diff suppressed because it is too large Load Diff

38
flatlaf-testing/dumps/uidefaults/FlatIntelliJLaf_1.8.0_202.txt
View File

@@ -12,44 +12,44 @@
- Button.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatButtonBorder [UI]
+ Button.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatButtonBorder [UI]
- Button.default.background #ffffff javax.swing.plaf.ColorUIResource [UI]
+ Button.default.background #4d8ac9 javax.swing.plaf.ColorUIResource [UI]
- Button.default.background #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI]
+ Button.default.background #4d8ac9 HSL 210 53 55 javax.swing.plaf.ColorUIResource [UI]
+ Button.default.boldText true
- Button.default.borderColor #4f9ee3 javax.swing.plaf.ColorUIResource [UI]
+ Button.default.borderColor #3d75b2 javax.swing.plaf.ColorUIResource [UI]
- Button.default.borderColor #4f9ee3 HSL 208 73 60 javax.swing.plaf.ColorUIResource [UI]
+ Button.default.borderColor #3d75b2 HSL 211 49 47 javax.swing.plaf.ColorUIResource [UI]
- Button.default.borderWidth 2
+ Button.default.borderWidth 1
- Button.default.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI]
- Button.default.focusedBackground #e3f1fa HSL 203 70 94 javax.swing.plaf.ColorUIResource [UI]
- Button.default.focusedBorderColor #87afda javax.swing.plaf.ColorUIResource [UI]
+ Button.default.focusedBorderColor #a9c9f5 javax.swing.plaf.ColorUIResource [UI]
- Button.default.focusedBorderColor #87afda HSL 211 53 69 javax.swing.plaf.ColorUIResource [UI]
+ Button.default.focusedBorderColor #a9c9f5 HSL 215 79 81 javax.swing.plaf.ColorUIResource [UI]
- Button.default.foreground #000000 javax.swing.plaf.ColorUIResource [UI]
+ Button.default.foreground #ffffff javax.swing.plaf.ColorUIResource [UI]
- Button.default.foreground #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI]
+ Button.default.foreground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI]
- Button.default.hoverBackground #f7f7f7 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse)
+ Button.default.hoverBackground #4182c5 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse)
- Button.default.hoverBackground #f7f7f7 HSL 0 0 97 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse)
+ Button.default.hoverBackground #4182c5 HSL 210 53 51 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse)
- Button.default.hoverBorderColor #87afda javax.swing.plaf.ColorUIResource [UI]
+ Button.default.hoverBorderColor #a9c9f5 javax.swing.plaf.ColorUIResource [UI]
- Button.default.hoverBorderColor #87afda HSL 211 53 69 javax.swing.plaf.ColorUIResource [UI]
+ Button.default.hoverBorderColor #a9c9f5 HSL 215 79 81 javax.swing.plaf.ColorUIResource [UI]
- Button.default.pressedBackground #e6e6e6 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse)
+ Button.default.pressedBackground #3571ae com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse)
- Button.default.pressedBackground #e6e6e6 HSL 0 0 90 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse)
+ Button.default.pressedBackground #3571ae HSL 210 53 45 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse)
- Button.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI]
- Button.focusedBackground #e3f1fa HSL 203 70 94 javax.swing.plaf.ColorUIResource [UI]
#---- CheckBox ----
- CheckBox.icon.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI]
- CheckBox.icon.focusedBackground #e3f1fa HSL 203 70 94 javax.swing.plaf.ColorUIResource [UI]
+ CheckBox.icon.style filled
- CheckBox.icon[filled].selectedFocusedCheckmarkColor #e3f1fa javax.swing.plaf.ColorUIResource [UI]
- CheckBox.icon[filled].selectedFocusedCheckmarkColor #e3f1fa HSL 203 70 94 javax.swing.plaf.ColorUIResource [UI]
#---- ComboBox ----
@@ -81,7 +81,7 @@
#---- HelpButton ----
- HelpButton.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI]
- HelpButton.focusedBackground #e3f1fa HSL 203 70 94 javax.swing.plaf.ColorUIResource [UI]
- HelpButton.icon [lazy] 22,22 com.formdev.flatlaf.icons.FlatHelpButtonIcon [UI]
+ HelpButton.icon [lazy] 26,26 com.formdev.flatlaf.icons.FlatHelpButtonIcon [UI]

1038
flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt
View File

File diff suppressed because it is too large Load Diff

1056
flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt
View File

File diff suppressed because it is too large Load Diff

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

@@ -70,6 +70,7 @@ import com.formdev.flatlaf.ui.FlatUIUtils;
import com.formdev.flatlaf.util.ColorFunctions.ColorFunction;
import com.jidesoft.plaf.LookAndFeelFactory;
import com.formdev.flatlaf.util.DerivedColor;
import com.formdev.flatlaf.util.HSLColor;
import com.formdev.flatlaf.util.StringUtils;
import com.formdev.flatlaf.util.SystemInfo;
@@ -84,6 +85,7 @@ public class UIDefaultsDump
private final UIDefaults defaults;
private final Properties derivedColorKeys;
private final boolean isIntelliJTheme;
private final boolean dumpHSL;
private String lastPrefix;
private JComponent dummyComponent;
@@ -349,6 +351,7 @@ public class UIDefaultsDump
derivedColorKeys = loadDerivedColorKeys();
isIntelliJTheme = (lookAndFeel instanceof IntelliJTheme.ThemeLaf);
dumpHSL = lookAndFeel instanceof FlatLaf;
}
private void dump( PrintWriter out, Predicate<String> keyFilter ) {
@@ -457,16 +460,16 @@ public class UIDefaultsDump
if( resolvedColor != color && resolvedColor.getRGB() != color.getRGB() ) {
if( !isIntelliJTheme ) {
System.err.println( "Key '" + key + "': derived colors not equal" );
System.err.println( " Default color: " + dumpColorHex( color ) );
System.err.println( " Resolved color: " + dumpColorHex( resolvedColor ) );
System.err.println( " Default color: " + dumpColorHexAndHSL( color ) );
System.err.println( " Resolved color: " + dumpColorHexAndHSL( resolvedColor ) );
}
out.printf( "%s / ",
dumpColorHex( resolvedColor ) );
dumpColorHexAndHSL( resolvedColor ) );
}
out.printf( "%s %s",
dumpColorHex( color ),
dumpColorHexAndHSL( color ),
dumpClass( color ) );
if( color instanceof DerivedColor ) {
@@ -479,6 +482,13 @@ public class UIDefaultsDump
}
}
private String dumpColorHexAndHSL( Color color ) {
String hex = dumpColorHex( color );
return dumpHSL
? hex + " " + dumpColorHSL( color )
: hex;
}
private String dumpColorHex( Color color ) {
boolean hasAlpha = (color.getAlpha() != 255);
return hasAlpha
@@ -486,6 +496,21 @@ public class UIDefaultsDump
: String.format( "#%06x", color.getRGB() & 0xffffff );
}
private String dumpColorHSL( Color color ) {
HSLColor hslColor = new HSLColor( color );
int hue = Math.round( hslColor.getHue() );
int saturation = Math.round( hslColor.getSaturation() );
int luminance = Math.round( hslColor.getLuminance() );
if( color.getAlpha() == 255 ) {
return String.format( "HSL %3d %3d %3d",
hue, saturation, luminance );
} else {
int alpha = Math.round( hslColor.getAlpha() * 100 );
return String.format( "HSLA %3d %3d %3d %2d",
hue, saturation, luminance, alpha );
}
}
private void dumpFont( PrintWriter out, Font font ) {
String strStyle = font.isBold()
? font.isItalic() ? "bolditalic" : "bold"