From 00a3ad738f1326a28ef9f54fd28458b65fff4af6 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Sun, 31 Oct 2021 18:26:31 +0100 Subject: [PATCH] CheckBox and RadioButton: made selected icon better recognizable in **FlatLaf Light** (use blue border), **Dark** and **Darcula** (use lighter border) themes; **IntelliJ** theme is not changed --- CHANGELOG.md | 3 +++ .../main/resources/com/formdev/flatlaf/FlatDarkLaf.properties | 3 ++- .../main/resources/com/formdev/flatlaf/FlatLightLaf.properties | 3 ++- flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0.txt | 3 ++- flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0.txt | 3 ++- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eef6d099..e165e463 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,9 @@ FlatLaf Change Log - ComboBox, Spinner, TextField and subclasses: Support specifying width of border (see UI value `Component.borderWidth`). - CheckBox and RadioButton: + - Made selected icon better recognizable in **FlatLaf Light** (use blue + border), **Dark** and **Darcula** (use lighter border) themes. **IntelliJ** + theme is not changed. - Support specifying width of icon border (see UI value `CheckBox.icon.borderWidth`). - Reworked icon UI defaults and added missing ones. **Note**: There are minor 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 029979ce..6ba407e6 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties @@ -131,7 +131,7 @@ Button.toolbar.selectedBackground = lighten($Button.background,7%,derived) # enabled CheckBox.icon.borderColor = tint($Component.borderColor,5%) CheckBox.icon.background = tint(@background,5%) -CheckBox.icon.selectedBorderColor = $CheckBox.icon.borderColor +CheckBox.icon.selectedBorderColor = tint($CheckBox.icon.borderColor,20%) CheckBox.icon.selectedBackground = $CheckBox.icon.background CheckBox.icon.checkmarkColor = shade(@foreground,10%) @@ -149,6 +149,7 @@ CheckBox.icon.hoverBorderColor = $CheckBox.icon.focusedBorderColor CheckBox.icon.hoverBackground = lighten($CheckBox.icon.background,3%,derived) # pressed +CheckBox.icon.pressedBorderColor = $CheckBox.icon.focusedBorderColor CheckBox.icon.pressedBackground = lighten($CheckBox.icon.background,6%,derived) 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 90bf9a8a..7f73d7a4 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties @@ -134,7 +134,7 @@ Button.toolbar.selectedBackground = $Button.selectedBackground # enabled CheckBox.icon.borderColor = shade($Component.borderColor,10%) CheckBox.icon.background = @buttonBackground -CheckBox.icon.selectedBorderColor = $CheckBox.icon.borderColor +CheckBox.icon.selectedBorderColor = $CheckBox.icon.checkmarkColor CheckBox.icon.selectedBackground = $CheckBox.icon.background CheckBox.icon.checkmarkColor = @accentCheckmarkColor @@ -152,6 +152,7 @@ CheckBox.icon.hoverBorderColor = $CheckBox.icon.focusedBorderColor CheckBox.icon.hoverBackground = darken($CheckBox.icon.background,3%,derived) # pressed +CheckBox.icon.pressedBorderColor = $CheckBox.icon.focusedBorderColor CheckBox.icon.pressedBackground = darken($CheckBox.icon.background,10%,derived) diff --git a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0.txt b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0.txt index eca1cbee..aa8743f5 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0.txt @@ -133,8 +133,9 @@ CheckBox.icon.focusedBorderColor #446e9e HSL 212 40 44 javax.swing.plaf.Co CheckBox.icon.hoverBackground #4d5153 HSL 200 4 31 com.formdev.flatlaf.util.DerivedColor [UI] lighten(3% autoInverse) CheckBox.icon.hoverBorderColor #446e9e HSL 212 40 44 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.pressedBackground #55585b HSL 210 3 35 com.formdev.flatlaf.util.DerivedColor [UI] lighten(6% autoInverse) +CheckBox.icon.pressedBorderColor #446e9e HSL 212 40 44 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.selectedBackground #46494b HSL 204 3 28 javax.swing.plaf.ColorUIResource [UI] -CheckBox.icon.selectedBorderColor #696b6d HSL 210 2 42 javax.swing.plaf.ColorUIResource [UI] +CheckBox.icon.selectedBorderColor #87898a HSL 200 1 54 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon [lazy] 15,15 com.formdev.flatlaf.icons.FlatCheckBoxIcon [UI] CheckBox.iconTextGap 4 CheckBox.icon[filled].checkmarkColor #46494b HSL 204 3 28 javax.swing.plaf.ColorUIResource [UI] diff --git a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0.txt b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0.txt index 6797cbd9..105871df 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0.txt @@ -134,8 +134,9 @@ CheckBox.icon.focusedBorderColor #7b9ebf HSL 209 35 62 javax.swing.plaf.Co CheckBox.icon.hoverBackground #f7f7f7 HSL 0 0 97 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse) CheckBox.icon.hoverBorderColor #7b9ebf HSL 209 35 62 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.pressedBackground #e6e6e6 HSL 0 0 90 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse) +CheckBox.icon.pressedBorderColor #7b9ebf HSL 209 35 62 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.selectedBackground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] -CheckBox.icon.selectedBorderColor #afafaf HSL 0 0 69 javax.swing.plaf.ColorUIResource [UI] +CheckBox.icon.selectedBorderColor #4e9de7 HSL 209 76 61 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon [lazy] 15,15 com.formdev.flatlaf.icons.FlatCheckBoxIcon [UI] CheckBox.iconTextGap 4 CheckBox.icon[filled].checkmarkColor #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI]