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

UIDefaultsLoader: added over() color function to convert a translucent color into a solid color based on any background color

Browse Source
This commit is contained in:
Karl Tauber
2022-05-09 23:28:40 +02:00
parent 96d4bda6c8
commit 96f2a02cfa
4 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatCompletionProvider.java
View File

@@ -482,6 +482,10 @@ class FlatCompletionProvider
"dark", colorParamDesc,
"light", colorParamDesc,
"threshold", "(optional) 0-100%, default is 43%" );
addFunction( "over",
"foreground", colorParamDesc,
"background", colorParamDesc );
}
private void addFunction( String name, String... paramNamesAndDescs ) {

1
flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeTokenMaker.java
View File

@@ -76,6 +76,7 @@ public class FlatThemeTokenMaker
tokenMap.put( "tint", TOKEN_FUNCTION );
tokenMap.put( "shade", TOKEN_FUNCTION );
tokenMap.put( "contrast", TOKEN_FUNCTION );
tokenMap.put( "over", TOKEN_FUNCTION );
// function options
tokenMap.put( "relative", Token.RESERVED_WORD );

6
flatlaf-theme-editor/theme-editor-test.properties
View File

@@ -118,6 +118,12 @@ Prop.6.selectionForeground = contrast($Prop.6.selectionBackground,#000,#fff)
Prop.7.selectionBackground = #FF9500
Prop.7.selectionForeground = contrast($Prop.7.selectionBackground,#000,#fff)
Prop.colorFunc60 = over(#fff8,#f00)
Prop.colorFunc61 = over(#fff8,#0f0)
Prop.colorFunc62 = over(#f000,#0f0)
Prop.colorFunc63 = over(#f00,#0f0)
Prop.colorFunc64 = over(#f008,null)
@varStyle1 = #f0f