From b381e20e57c0bb560d98604d413f867b6d6491b8 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Thu, 11 Aug 2022 23:52:35 +0200 Subject: [PATCH] UIDefaultsLoader: over() color function should always return a ColorUIResource --- .../src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java index ac82bd22..294f753c 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java @@ -1052,7 +1052,7 @@ class UIDefaultsLoader * 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 */ - private static Object parseColorOver( List params, Function resolver, boolean reportError ) { + private static ColorUIResource parseColorOver( List params, Function resolver, boolean reportError ) { String foregroundStr = params.get( 0 ); String backgroundStr = params.get( 1 ); @@ -1061,7 +1061,8 @@ class UIDefaultsLoader if( foreground == null || foreground.getAlpha() == 255 ) return foreground; - Color foreground2 = new Color( foreground.getRGB() ); + // foreground color without alpha + ColorUIResource foreground2 = new ColorUIResource( foreground.getRGB() ); // parse background color ColorUIResource background = (ColorUIResource) parseColorOrFunction( resolver.apply( backgroundStr ), resolver, reportError );