From fff0e5e9467bda358267df257968d892cfe22fd5 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Mon, 21 Oct 2019 20:11:35 +0200 Subject: [PATCH] fixed FlatTestLaf (broken by commit 342b932f9eda0f2dfc2de4e09fb532d52032d2e8) --- .../main/resources/com/formdev/flatlaf/FlatLaf.properties | 1 + .../resources/com/formdev/flatlaf/FlatLightLaf.properties | 1 - .../resources/com/formdev/flatlaf/FlatTestLaf.properties | 5 +++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties index 4b78a6c7..15f7dedb 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties @@ -409,6 +409,7 @@ ToolBar.separatorColor=@@Separator.foreground #---- ToolTip ---- +ToolTip.border=4,6,4,6,@@Component.borderColor ToolTip.borderInactive=null ToolTip.backgroundInactive=@@ToolTip.background ToolTip.foregroundInactive=@disabledText diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties index e2629471..c0861b9d 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties @@ -234,7 +234,6 @@ ToggleButton.toolbar.selectedBackground=cfcfcf #---- ToolTip ---- -ToolTip.border=4,6,4,6,@@Component.borderColor ToolTip.background=fafafa diff --git a/flatlaf-core/src/test/resources/com/formdev/flatlaf/FlatTestLaf.properties b/flatlaf-core/src/test/resources/com/formdev/flatlaf/FlatTestLaf.properties index a0c67fc1..ad511051 100644 --- a/flatlaf-core/src/test/resources/com/formdev/flatlaf/FlatTestLaf.properties +++ b/flatlaf-core/src/test/resources/com/formdev/flatlaf/FlatTestLaf.properties @@ -20,6 +20,7 @@ @selectionBackground=00aa00 @selectionInactiveBackground=888888 @selectionInactiveForeground=ffffff +@disabledText=000088 @textComponentBackground=ffffff @cellFocusColor=ff0000 @icon=afafaf @@ -37,8 +38,8 @@ *.selectionBackground=@selectionBackground *.selectionForeground=ffff00 *.disabledBackground=e0e0e0 -*.disabledForeground=000088 -*.disabledText=000088 +*.disabledForeground=@disabledText +*.disabledText=@disabledText *.acceleratorForeground=ff8888 *.acceleratorSelectionForeground=ffffff