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

UIDefaultsLoader:

Browse Source 
- detect colors and UIs
- fixed parsing of colors with transparency
- allow '#' prefix colors
This commit is contained in:
Karl Tauber
2019-11-10 22:35:31 +01:00
parent 368611359c
commit 30db9d13a5
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java
View File

@@ -200,7 +200,9 @@ class UIDefaultsLoader
// determine value type from key
if( valueType == ValueType.UNKNOWN ) {
if( key.endsWith( ".border" ) || key.endsWith( "Border" ) )
if( key.endsWith( "ground" ) || key.endsWith( "Color" ) )
valueType = ValueType.COLOR;
else if( key.endsWith( ".border" ) || key.endsWith( "Border" ) )
valueType = ValueType.BORDER;
else if( key.endsWith( ".icon" ) || key.endsWith( "Icon" ) )
valueType = ValueType.ICON;
@@ -211,6 +213,8 @@ class UIDefaultsLoader
valueType = ValueType.SIZE;
else if( key.endsWith( "Width" ) || key.endsWith( "Height" ) )
valueType = ValueType.INTEGER;
else if( key.endsWith( "UI" ) )
valueType = ValueType.STRING;
}
// parse value
@@ -297,12 +301,19 @@ class UIDefaultsLoader
if( value.endsWith( ")" ) )
return parseColorFunctions( value, reportError );
if( value.startsWith( "#" ) )
value = value.substring( 1 );
int valueLength = value.length();
if( valueLength != 6 && valueLength != 8 )
return null;
try {
int rgb = Integer.parseInt( value, 16 );
if( value.length() == 6 )
return new ColorUIResource( rgb );
if( value.length() == 8 )
return new ColorUIResource( new Color( rgb, true ) );
long rgb = Long.parseLong( value, 16 );
if( valueLength == 6 )
return new ColorUIResource( (int) rgb );
if( valueLength == 8 )
return new ColorUIResource( new Color( (int) (((rgb >> 8) & 0xffffff) | ((rgb & 0xff) << 24)), true ) );
if( reportError )
throw new NumberFormatException( value );