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

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

View File

@@ -32,6 +32,8 @@
@menuHoverBackground=lighten(@menuBackground,10%,derived)
@menuCheckBackground=lighten(@menuBackground,10%,derived)
@menuCheckHoverBackground=lighten(@menuBackground,20%,derived)
@menuAcceleratorForeground=darken(@foreground,15%)
@menuAcceleratorSelectionForeground=@selectionForeground
@cellFocusColor=#000
@icon=#adadad
@@ -42,22 +44,6 @@
@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 ----
activeCaption=#434E60

View File

@@ -67,6 +67,22 @@ ViewportUI=com.formdev.flatlaf.ui.FlatViewportUI
@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 ----
desktop=@textComponentBackground

View File

@@ -32,6 +32,8 @@
@menuHoverBackground=darken(@menuBackground,10%,derived)
@menuCheckBackground=darken(@menuBackground,10%,derived)
@menuCheckHoverBackground=darken(@menuBackground,20%,derived)
@menuAcceleratorForeground=lighten(@foreground,30%)
@menuAcceleratorSelectionForeground=@selectionForeground
@cellFocusColor=#000
@icon=#afafaf
@@ -42,22 +44,6 @@
@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 ----
activeCaption=#99b4d1