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

UI defaults inspector: for derived colors, no longer change Item.value from Color to Color[] because this could cause problems if there is a UI value of type Color[]

Browse Source
This commit is contained in:
Karl Tauber
2021-02-06 01:01:48 +01:00
parent bc443f47f1
commit 575b8e3f7f
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatUIDefaultsInspector.java
View File

@@ -322,10 +322,11 @@ public class FlatUIDefaultsInspector
continue; continue;
// resolve derived color // resolve derived color
Object info = null;
if( value instanceof DerivedColor ) { if( value instanceof DerivedColor ) {
Color resolvedColor = resolveDerivedColor( defaults, (String) key, (DerivedColor) value, pBaseColor ); Color resolvedColor = resolveDerivedColor( defaults, (String) key, (DerivedColor) value, pBaseColor );
if( resolvedColor != value ) if( resolvedColor != value )
value = new Color[] { resolvedColor, pBaseColor[0], (Color) value }; info = new Color[] { resolvedColor, pBaseColor[0] };
} }
// check whether key was overridden using UIManager.put(key,value) // check whether key was overridden using UIManager.put(key,value)
@@ -334,7 +335,7 @@ public class FlatUIDefaultsInspector
lafValue = lafDefaults.get( key ); lafValue = lafDefaults.get( key );
// add item // add item
items.add( new Item( String.valueOf( key ), value, lafValue ) ); items.add( new Item( String.valueOf( key ), value, lafValue, info ) );
} }
return items.toArray( new Item[items.size()] ); return items.toArray( new Item[items.size()] );
@@ -477,7 +478,7 @@ public class FlatUIDefaultsInspector
return "Boolean"; return "Boolean";
if( value instanceof Border ) if( value instanceof Border )
return "Border"; return "Border";
if( value instanceof Color || value instanceof Color[] ) if( value instanceof Color )
return "Color"; return "Color";
if( value instanceof Dimension ) if( value instanceof Dimension )
return "Dimension"; return "Dimension";
@@ -669,24 +670,26 @@ public class FlatUIDefaultsInspector
final String key; final String key;
final Object value; final Object value;
final Object lafValue; final Object lafValue;
final Object info;
private String valueStr; private String valueStr;
Item( String key, Object value, Object lafValue ) { Item( String key, Object value, Object lafValue, Object info ) {
this.key = key; this.key = key;
this.value = value; this.value = value;
this.lafValue = lafValue; this.lafValue = lafValue;
this.info = info;
} }
String getValueAsString() { String getValueAsString() {
if( valueStr == null ) if( valueStr == null )
valueStr = valueAsString( value ); valueStr = valueAsString( value, info );
return valueStr; return valueStr;
} }
static String valueAsString( Object value ) { static String valueAsString( Object value, Object info ) {
if( value instanceof Color || value instanceof Color[] ) { if( value instanceof Color ) {
Color color = (value instanceof Color[]) ? ((Color[])value)[0] : (Color) value; Color color = (info instanceof Color[]) ? ((Color[])info)[0] : (Color) value;
HSLColor hslColor = new HSLColor( color ); HSLColor hslColor = new HSLColor( color );
if( color.getAlpha() == 255 ) { if( color.getAlpha() == 255 ) {
return String.format( "%-9s HSL %3d %3d %3d", return String.format( "%-9s HSL %3d %3d %3d",
@@ -720,7 +723,7 @@ public class FlatUIDefaultsInspector
Border border = (Border) value; Border border = (Border) value;
if( border instanceof FlatLineBorder ) { if( border instanceof FlatLineBorder ) {
FlatLineBorder lineBorder = (FlatLineBorder) border; FlatLineBorder lineBorder = (FlatLineBorder) border;
return valueAsString( lineBorder.getUnscaledBorderInsets() ) return valueAsString( lineBorder.getUnscaledBorderInsets(), null )
+ " " + color2hex( lineBorder.getLineColor() ) + " " + color2hex( lineBorder.getLineColor() )
+ " " + lineBorder.getLineThickness() + " " + lineBorder.getLineThickness()
+ " " + border.getClass().getName(); + " " + border.getClass().getName();
@@ -728,7 +731,7 @@ public class FlatUIDefaultsInspector
Insets insets = (border instanceof FlatEmptyBorder) Insets insets = (border instanceof FlatEmptyBorder)
? ((FlatEmptyBorder)border).getUnscaledBorderInsets() ? ((FlatEmptyBorder)border).getUnscaledBorderInsets()
: ((EmptyBorder)border).getBorderInsets(); : ((EmptyBorder)border).getBorderInsets();
return valueAsString( insets ) + " " + border.getClass().getName(); return valueAsString( insets, null ) + " " + border.getClass().getName();
} else if( border instanceof FlatBorder || border instanceof FlatMarginBorder ) } else if( border instanceof FlatBorder || border instanceof FlatMarginBorder )
return border.getClass().getName(); return border.getClass().getName();
else else
@@ -991,7 +994,7 @@ public class FlatUIDefaultsInspector
init( table, item.key, isSelected, row ); init( table, item.key, isSelected, row );
// reset background, foreground and icon // reset background, foreground and icon
if( !(item.value instanceof Color) && !(item.value instanceof Color[]) ) { if( !(item.value instanceof Color) ) {
setBackground( null ); setBackground( null );
setForeground( null ); setForeground( null );
} }
@@ -1003,8 +1006,8 @@ public class FlatUIDefaultsInspector
super.getTableCellRendererComponent( table, value, isSelected, hasFocus, row, column ); super.getTableCellRendererComponent( table, value, isSelected, hasFocus, row, column );
if( item.value instanceof Color || item.value instanceof Color[] ) { if( item.value instanceof Color ) {
Color color = (item.value instanceof Color[]) ? ((Color[])item.value)[0] : (Color) item.value; Color color = (item.info instanceof Color[]) ? ((Color[])item.info)[0] : (Color) item.value;
boolean isDark = new HSLColor( color ).getLuminance() < 70 && color.getAlpha() >= 128; boolean isDark = new HSLColor( color ).getLuminance() < 70 && color.getAlpha() >= 128;
setBackground( color ); setBackground( color );
setForeground( isDark ? Color.white : Color.black ); setForeground( isDark ? Color.white : Color.black );
@@ -1019,7 +1022,7 @@ public class FlatUIDefaultsInspector
: String.valueOf( item.value ); : String.valueOf( item.value );
if( item.lafValue != null ) { if( item.lafValue != null ) {
toolTipText += " \n\nLaF UI default value was overridden with UIManager.put(key,value):\n " toolTipText += " \n\nLaF UI default value was overridden with UIManager.put(key,value):\n "
+ Item.valueAsString( item.lafValue ) + "\n " + String.valueOf( item.lafValue ); + Item.valueAsString( item.lafValue, null ) + "\n " + String.valueOf( item.lafValue );
} }
setToolTipText( toolTipText ); setToolTipText( toolTipText );
@@ -1028,7 +1031,7 @@ public class FlatUIDefaultsInspector
@Override @Override
protected void paintComponent( Graphics g ) { protected void paintComponent( Graphics g ) {
if( item.value instanceof Color || item.value instanceof Color[] ) { if( item.value instanceof Color ) {
int width = getWidth(); int width = getWidth();
int height = getHeight(); int height = getHeight();
Color background = getBackground(); Color background = getBackground();
@@ -1036,13 +1039,13 @@ public class FlatUIDefaultsInspector
// paint color // paint color
fillRect( g, background, 0, 0, width, height ); fillRect( g, background, 0, 0, width, height );
if( item.value instanceof Color[] ) { if( item.info instanceof Color[] ) {
// paint base color // paint base color
int width2 = height * 2; int width2 = height * 2;
fillRect( g, ((Color[])item.value)[1], width - width2, 0, width2, height ); fillRect( g, ((Color[])item.info)[1], width - width2, 0, width2, height );
// paint default color // paint default color
Color defaultColor = ((Color[])item.value)[2]; Color defaultColor = (Color) item.value;
if( defaultColor != null && !defaultColor.equals( background ) ) { if( defaultColor != null && !defaultColor.equals( background ) ) {
int width3 = height / 2; int width3 = height / 2;
fillRect( g, defaultColor, width - width3, 0, width3, height ); fillRect( g, defaultColor, width - width3, 0, width3, height );