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

UIDefaultsLoader: over() color function should always return a ColorUIResource

Browse Source
This commit is contained in:
Karl Tauber
2022-08-11 23:52:35 +02:00
parent 475cc9a9a5
commit b381e20e57
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1052,7 +1052,7 @@ class UIDefaultsLoader
* the alpha of this color is used as weight to mix the two colors * the alpha of this color is used as weight to mix the two colors
* - background: a background color (e.g. #f00) or a color function * - background: a background color (e.g. #f00) or a color function
*/ */
private static Object parseColorOver( List<String> params, Function<String, String> resolver, boolean reportError ) { private static ColorUIResource parseColorOver( List<String> params, Function<String, String> resolver, boolean reportError ) {
String foregroundStr = params.get( 0 ); String foregroundStr = params.get( 0 );
String backgroundStr = params.get( 1 ); String backgroundStr = params.get( 1 );
@@ -1061,7 +1061,8 @@ class UIDefaultsLoader
if( foreground == null || foreground.getAlpha() == 255 ) if( foreground == null || foreground.getAlpha() == 255 )
return foreground; return foreground;
Color foreground2 = new Color( foreground.getRGB() ); // foreground color without alpha
ColorUIResource foreground2 = new ColorUIResource( foreground.getRGB() );
// parse background color // parse background color
ColorUIResource background = (ColorUIResource) parseColorOrFunction( resolver.apply( backgroundStr ), resolver, reportError ); ColorUIResource background = (ColorUIResource) parseColorOrFunction( resolver.apply( backgroundStr ), resolver, reportError );