UIDefaultsDump: dump color value in same format as used in FlatLaf properties files; also dump alpha as percentage

This commit is contained in:
Karl Tauber
2021-02-04 15:24:50 +01:00
parent 9d5934df14
commit 10d1e4b798
5 changed files with 14 additions and 13 deletions

View File

@@ -13,7 +13,7 @@
- Button.innerFocusWidth 1
+ Button.innerFocusWidth 0
- CheckBox.icon.focusedBackground #4d466d94 javax.swing.plaf.ColorUIResource [UI]
- CheckBox.icon.focusedBackground #466d944d 30% javax.swing.plaf.ColorUIResource [UI]
- ComboBox.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatRoundBorder [UI]
+ ComboBox.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatRoundBorder [UI]

View File

@@ -127,7 +127,7 @@ CheckBox.icon.checkmarkColor #a7a7a7 javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon.disabledBorderColor #545556 javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon.disabledCheckmarkColor #606060 javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon.focusedBackground #4d466d94 javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon.focusedBackground #466d944d 30% javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon.focusedBorderColor #466d94 javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon.hoverBackground #4a5152 com.formdev.flatlaf.util.DerivedColor [UI] lighten(3% autoInverse)
CheckBox.icon.hoverBorderColor #466d94 javax.swing.plaf.ColorUIResource [UI]
@@ -648,7 +648,7 @@ PanelUI com.formdev.flatlaf.ui.FlatPanelUI
PasswordField.background #45494a javax.swing.plaf.ColorUIResource [UI]
PasswordField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI]
PasswordField.capsLockIcon [lazy] 16,16 com.formdev.flatlaf.icons.FlatCapsLockIcon [UI]
PasswordField.capsLockIconColor #64ffffff javax.swing.plaf.ColorUIResource [UI]
PasswordField.capsLockIconColor #ffffff64 39% javax.swing.plaf.ColorUIResource [UI]
PasswordField.caretBlinkRate 500
PasswordField.caretForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
PasswordField.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI]
@@ -855,7 +855,7 @@ Slider.disabledTrackColor #4c5052 javax.swing.plaf.ColorUIResource [UI]
Slider.focus #7e7e7e javax.swing.plaf.ColorUIResource [UI]
Slider.focusInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
Slider.focusWidth 4
Slider.focusedColor #b33d6185 com.formdev.flatlaf.util.DerivedColor [UI] fade(70%)
Slider.focusedColor #3d6185b3 70% com.formdev.flatlaf.util.DerivedColor [UI] fade(70%)
Slider.font [active] $defaultFont [UI]
Slider.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
Slider.highlight #242424 javax.swing.plaf.ColorUIResource [UI]
@@ -1129,7 +1129,7 @@ TitlePane.buttonSize 44,30 javax.swing.plaf.DimensionUIResource [UI
TitlePane.closeHoverBackground #e81123 javax.swing.plaf.ColorUIResource [UI]
TitlePane.closeHoverForeground #ffffff javax.swing.plaf.ColorUIResource [UI]
TitlePane.closeIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowCloseIcon [UI]
TitlePane.closePressedBackground #99e81123 javax.swing.plaf.ColorUIResource [UI]
TitlePane.closePressedBackground #e8112399 60% javax.swing.plaf.ColorUIResource [UI]
TitlePane.closePressedForeground #ffffff javax.swing.plaf.ColorUIResource [UI]
TitlePane.embeddedForeground #959595 javax.swing.plaf.ColorUIResource [UI]
TitlePane.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]

View File

@@ -653,7 +653,7 @@ PanelUI com.formdev.flatlaf.ui.FlatPanelUI
PasswordField.background #ffffff javax.swing.plaf.ColorUIResource [UI]
PasswordField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI]
PasswordField.capsLockIcon [lazy] 16,16 com.formdev.flatlaf.icons.FlatCapsLockIcon [UI]
PasswordField.capsLockIconColor #64000000 javax.swing.plaf.ColorUIResource [UI]
PasswordField.capsLockIconColor #00000064 39% javax.swing.plaf.ColorUIResource [UI]
PasswordField.caretBlinkRate 500
PasswordField.caretForeground #000000 javax.swing.plaf.ColorUIResource [UI]
PasswordField.disabledBackground #f2f2f2 javax.swing.plaf.ColorUIResource [UI]
@@ -860,7 +860,7 @@ Slider.disabledTrackColor #c0c0c0 javax.swing.plaf.ColorUIResource [UI]
Slider.focus #9e9e9e javax.swing.plaf.ColorUIResource [UI]
Slider.focusInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
Slider.focusWidth 4
Slider.focusedColor #8097c3f3 com.formdev.flatlaf.util.DerivedColor [UI] fade(50%)
Slider.focusedColor #97c3f380 50% com.formdev.flatlaf.util.DerivedColor [UI] fade(50%)
Slider.font [active] $defaultFont [UI]
Slider.foreground #000000 javax.swing.plaf.ColorUIResource [UI]
Slider.highlight #ffffff javax.swing.plaf.ColorUIResource [UI]
@@ -1134,7 +1134,7 @@ TitlePane.buttonSize 44,30 javax.swing.plaf.DimensionUIResource [UI
TitlePane.closeHoverBackground #e81123 javax.swing.plaf.ColorUIResource [UI]
TitlePane.closeHoverForeground #ffffff javax.swing.plaf.ColorUIResource [UI]
TitlePane.closeIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowCloseIcon [UI]
TitlePane.closePressedBackground #99e81123 javax.swing.plaf.ColorUIResource [UI]
TitlePane.closePressedBackground #e8112399 60% javax.swing.plaf.ColorUIResource [UI]
TitlePane.closePressedForeground #ffffff javax.swing.plaf.ColorUIResource [UI]
TitlePane.embeddedForeground #595959 javax.swing.plaf.ColorUIResource [UI]
TitlePane.foreground #000000 javax.swing.plaf.ColorUIResource [UI]

View File

@@ -706,7 +706,7 @@ ProgressBar.cellLength 1
ProgressBar.cellSpacing 0
ProgressBar.cycleTime 10000
ProgressBar.font [active] Segoe UI plain 10 javax.swing.plaf.FontUIResource [UI]
ProgressBar.foreground #33737373 javax.swing.plaf.ColorUIResource [UI]
ProgressBar.foreground #73737333 20% javax.swing.plaf.ColorUIResource [UI]
ProgressBar.horizontalSize 146,4 javax.swing.plaf.DimensionUIResource [UI]
ProgressBar.repaintInterval 15
ProgressBar.selectionBackground #000088 javax.swing.plaf.ColorUIResource [UI]
@@ -805,7 +805,7 @@ ScrollBar.minimumThumbSize 10,10 javax.swing.plaf.DimensionUIResource [UI
ScrollBar.pressedThumbWithTrack false
ScrollBar.showButtons false
ScrollBar.squareButtons false
ScrollBar.thumb #33737373 javax.swing.plaf.ColorUIResource [UI]
ScrollBar.thumb #73737333 20% javax.swing.plaf.ColorUIResource [UI]
ScrollBar.thumbArc 0
ScrollBar.thumbDarkShadow #696969 javax.swing.plaf.ColorUIResource [UI]
ScrollBar.thumbHighlight #ffffff javax.swing.plaf.ColorUIResource [UI]
@@ -1127,7 +1127,7 @@ TitlePane.buttonSize 44,30 javax.swing.plaf.DimensionUIResource [UI
TitlePane.closeHoverBackground #e81123 javax.swing.plaf.ColorUIResource [UI]
TitlePane.closeHoverForeground #ffffff javax.swing.plaf.ColorUIResource [UI]
TitlePane.closeIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowCloseIcon [UI]
TitlePane.closePressedBackground #99e81123 javax.swing.plaf.ColorUIResource [UI]
TitlePane.closePressedBackground #e8112399 60% javax.swing.plaf.ColorUIResource [UI]
TitlePane.closePressedForeground #ffffff javax.swing.plaf.ColorUIResource [UI]
TitlePane.foreground #0000ff javax.swing.plaf.ColorUIResource [UI]
TitlePane.iconMargins 3,8,3,0 javax.swing.plaf.InsetsUIResource [UI]

View File

@@ -416,8 +416,9 @@ public class UIDefaultsDump
private String dumpColorHex( Color color ) {
boolean hasAlpha = (color.getAlpha() != 255);
return String.format( hasAlpha ? "#%08x" : "#%06x",
hasAlpha ? color.getRGB() : (color.getRGB() & 0xffffff) );
return hasAlpha
? String.format( "#%06x%02x %d%%", color.getRGB() & 0xffffff, (color.getRGB() >> 24) & 0xff, Math.round( color.getAlpha() / 2.55f ) )
: String.format( "#%06x", color.getRGB() & 0xffffff );
}
private void dumpColorFunction( PrintWriter out, ColorFunction function ) {