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

UIDefaultsLoader: added mix() color function (inspired by Less CSS)

Browse Source
This commit is contained in:
Karl Tauber
2021-08-05 18:19:42 +02:00
parent 7f7f9e3c7c
commit 02b1ba2926
5 changed files with 84 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -370,6 +370,11 @@ class FlatCompletionProvider
addFunction( "changeSaturation", hslChangeParams );
addFunction( "changeLightness", hslChangeParams );
addFunction( "changeAlpha", hslChangeParams );
addFunction( "mix",
"color1", colorParamDesc,
"color2", colorParamDesc,
"weight", "(optional) 0-100%, default is 50%" );
}
private void addFunction( String name, String... paramNamesAndDescs ) {

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

@@ -68,6 +68,7 @@ public class FlatThemeTokenMaker
tokenMap.put( "changeSaturation", TOKEN_FUNCTION );
tokenMap.put( "changeLightness", TOKEN_FUNCTION );
tokenMap.put( "changeAlpha", TOKEN_FUNCTION );
tokenMap.put( "mix", TOKEN_FUNCTION );
tokenMap.put( "lazy", TOKEN_FUNCTION );
// function options

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

@@ -54,3 +54,11 @@ Prop.colorFunc20 = changeHue(#f00,180)
Prop.colorFunc21 = changeSaturation(#f00,50%)
Prop.colorFunc22 = changeLightness(#f00,80%)
Prop.colorFunc23 = changeAlpha(#f00,50%)
Prop.colorFunc30 = mix(#f00,#0f0,10%)
Prop.colorFunc31 = mix(#f00,#0f0,25%)
Prop.colorFunc32 = mix(#f00,#0f0)
Prop.colorFunc33 = mix(#f00,#0f0,75%)
Prop.colorFunc34 = mix(#f00,#0f0,90%)
Prop.colorFunc35 = mix($Prop.color1,$Prop.color2)
Prop.colorFunc36 = mix($Prop.colorFunc20,$Prop.colorFunc30)