From f97783ddefb4c2fa5ffc92943b13fd8be26d685b Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Sat, 16 Jan 2021 01:01:36 +0100 Subject: [PATCH] Window decorations: RootPane.activeBorderColor and RootPane.inactiveBorderColor fixes: - FlatDarkLaf.properties: changed darken() to lighten(), which does not change real colors due to autoInverse mechanism - FlatLightLaf.properties: use also derived colors (to be consistent with FlatDarkLaf.properties and fix warning in UIDefaultsDump) --- .../main/resources/com/formdev/flatlaf/FlatDarkLaf.properties | 4 ++-- .../resources/com/formdev/flatlaf/FlatLightLaf.properties | 4 ++-- flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt | 4 ++-- flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties index d48ccadf..33e70d87 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties @@ -218,8 +218,8 @@ ProgressBar.selectionBackground = @foreground #---- RootPane ---- -RootPane.activeBorderColor = darken(@background,7%,derived) -RootPane.inactiveBorderColor = darken(@background,5%,derived) +RootPane.activeBorderColor = lighten(@background,7%,derived) +RootPane.inactiveBorderColor = lighten(@background,5%,derived) #---- ScrollBar ---- 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 936c6d22..e93b82c3 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties @@ -230,8 +230,8 @@ ProgressBar.selectionBackground = @foreground #---- RootPane ---- -RootPane.activeBorderColor = #707070 -RootPane.inactiveBorderColor = lighten($RootPane.activeBorderColor,20%,derived) +RootPane.activeBorderColor = darken(@background,50%,derived) +RootPane.inactiveBorderColor = darken(@background,30%,derived) #---- ScrollBar ---- diff --git a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt index 2e591abb..96b1a394 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt @@ -764,7 +764,7 @@ Resizable.resizeBorder [lazy] 4,4,4,4 false com.formdev.flatlaf.ui.F #---- RootPane ---- -RootPane.activeBorderColor #4d5154 com.formdev.flatlaf.util.DerivedColor [UI] darken(7% autoInverse) +RootPane.activeBorderColor #4d5154 com.formdev.flatlaf.util.DerivedColor [UI] lighten(7% autoInverse) RootPane.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatRootPaneUI$FlatWindowBorder [UI] RootPane.borderDragThickness 5 RootPane.cornerDragWidth 16 @@ -779,7 +779,7 @@ RootPane.defaultButtonWindowKeyBindings length=8 [Ljava.lang.Object; [7] release RootPane.honorDialogMinimumSizeOnResize true RootPane.honorFrameMinimumSizeOnResize false -RootPane.inactiveBorderColor #484c4e com.formdev.flatlaf.util.DerivedColor [UI] darken(5% autoInverse) +RootPane.inactiveBorderColor #484c4e com.formdev.flatlaf.util.DerivedColor [UI] lighten(5% autoInverse) RootPaneUI com.formdev.flatlaf.ui.FlatRootPaneUI diff --git a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt index 77b5bc74..4509a66a 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt @@ -770,7 +770,7 @@ Resizable.resizeBorder [lazy] 4,4,4,4 false com.formdev.flatlaf.ui.F #---- RootPane ---- -RootPane.activeBorderColor #707070 javax.swing.plaf.ColorUIResource [UI] +RootPane.activeBorderColor #737373 com.formdev.flatlaf.util.DerivedColor [UI] darken(50% autoInverse) RootPane.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatRootPaneUI$FlatWindowBorder [UI] RootPane.borderDragThickness 5 RootPane.cornerDragWidth 16 @@ -785,7 +785,7 @@ RootPane.defaultButtonWindowKeyBindings length=8 [Ljava.lang.Object; [7] release RootPane.honorDialogMinimumSizeOnResize true RootPane.honorFrameMinimumSizeOnResize false -RootPane.inactiveBorderColor #bfbfbf / #a3a3a3 com.formdev.flatlaf.util.DerivedColor [UI] lighten(20% autoInverse) +RootPane.inactiveBorderColor #a6a6a6 com.formdev.flatlaf.util.DerivedColor [UI] darken(30% autoInverse) RootPaneUI com.formdev.flatlaf.ui.FlatRootPaneUI