Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-08 15:00:54 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

UI defaults: moved "globals" from FlatLightLaf.properties and FlatDarkLaf.properties to FlatLaf.properties

Browse Source
This commit is contained in:
Karl Tauber
2020-09-12 20:53:23 +02:00
parent faecffeadd
commit c8d461cdee
4 changed files with 22 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties
View File

@@ -32,6 +32,8 @@
@menuHoverBackground=lighten(@menuBackground,10%,derived) @menuHoverBackground=lighten(@menuBackground,10%,derived)
@menuCheckBackground=lighten(@menuBackground,10%,derived) @menuCheckBackground=lighten(@menuBackground,10%,derived)
@menuCheckHoverBackground=lighten(@menuBackground,20%,derived) @menuCheckHoverBackground=lighten(@menuBackground,20%,derived)
@menuAcceleratorForeground=darken(@foreground,15%)
@menuAcceleratorSelectionForeground=@selectionForeground
@cellFocusColor=#000 @cellFocusColor=#000
@icon=#adadad @icon=#adadad
@@ -42,22 +44,6 @@
@dropLineShortColor=lighten(List.selectionBackground,30%,lazy) @dropLineShortColor=lighten(List.selectionBackground,30%,lazy)
#---- globals ----
*.background=@background
*.foreground=@foreground
*.caretForeground=@foreground
*.inactiveBackground=@background
*.inactiveForeground=@disabledText
*.selectionBackground=@selectionBackground
*.selectionForeground=@selectionForeground
*.disabledBackground=@background
*.disabledForeground=@disabledText
*.disabledText=@disabledText
*.acceleratorForeground=darken(@foreground,15%)
*.acceleratorSelectionForeground=@selectionForeground
#---- system colors ---- #---- system colors ----
activeCaption=#434E60 activeCaption=#434E60

16
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
View File

@@ -67,6 +67,22 @@ ViewportUI=com.formdev.flatlaf.ui.FlatViewportUI
@menuItemMargin=3,6,3,6 @menuItemMargin=3,6,3,6
#---- globals ----
*.background=@background
*.foreground=@foreground
*.caretForeground=@foreground
*.inactiveBackground=@background
*.inactiveForeground=@disabledText
*.selectionBackground=@selectionBackground
*.selectionForeground=@selectionForeground
*.disabledBackground=@background
*.disabledForeground=@disabledText
*.disabledText=@disabledText
*.acceleratorForeground=@menuAcceleratorForeground
*.acceleratorSelectionForeground=@menuAcceleratorSelectionForeground
#---- system colors ---- #---- system colors ----
desktop=@textComponentBackground desktop=@textComponentBackground

18
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties
View File

@@ -32,6 +32,8 @@
@menuHoverBackground=darken(@menuBackground,10%,derived) @menuHoverBackground=darken(@menuBackground,10%,derived)
@menuCheckBackground=darken(@menuBackground,10%,derived) @menuCheckBackground=darken(@menuBackground,10%,derived)
@menuCheckHoverBackground=darken(@menuBackground,20%,derived) @menuCheckHoverBackground=darken(@menuBackground,20%,derived)
@menuAcceleratorForeground=lighten(@foreground,30%)
@menuAcceleratorSelectionForeground=@selectionForeground
@cellFocusColor=#000 @cellFocusColor=#000
@icon=#afafaf @icon=#afafaf
@@ -42,22 +44,6 @@
@dropLineShortColor=darken(List.selectionBackground,20%,lazy) @dropLineShortColor=darken(List.selectionBackground,20%,lazy)
#---- globals ----
*.background=@background
*.foreground=@foreground
*.caretForeground=@foreground
*.inactiveBackground=@background
*.inactiveForeground=@disabledText
*.selectionBackground=@selectionBackground
*.selectionForeground=@selectionForeground
*.disabledBackground=@background
*.disabledForeground=@disabledText
*.disabledText=@disabledText
*.acceleratorForeground=lighten(@foreground,30%)
*.acceleratorSelectionForeground=@selectionForeground
#---- system colors ---- #---- system colors ----
activeCaption=#99b4d1 activeCaption=#99b4d1

12
flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties
View File

@@ -28,6 +28,8 @@
@menuHoverBackground=darken(@menuBackground,10%) @menuHoverBackground=darken(@menuBackground,10%)
@menuCheckBackground=darken(@menuBackground,10%) @menuCheckBackground=darken(@menuBackground,10%)
@menuCheckHoverBackground=darken(@menuBackground,20%) @menuCheckHoverBackground=darken(@menuBackground,20%)
@menuAcceleratorForeground=#f88
@menuAcceleratorSelectionForeground=#fff
@cellFocusColor=#f00 @cellFocusColor=#f00
@icon=#afafaf @icon=#afafaf
@@ -39,20 +41,10 @@
#---- globals ---- #---- globals ----
*.background=@background
*.foreground=@foreground
*.textBackground=#cfc
*.textForeground=#f00
*.caretForeground=#00f *.caretForeground=#00f
*.inactiveBackground=#f0f0f0 *.inactiveBackground=#f0f0f0
*.inactiveForeground=#008 *.inactiveForeground=#008
*.selectionBackground=@selectionBackground
*.selectionForeground=@selectionForeground
*.disabledBackground=#e0e0e0 *.disabledBackground=#e0e0e0
*.disabledForeground=@disabledText
*.disabledText=@disabledText
*.acceleratorForeground=#f88
*.acceleratorSelectionForeground=#fff
#---- system colors ---- #---- system colors ----