From aa4e013097dea0b1bc3c009eea0d0ec8cf6cad82 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Wed, 3 Nov 2021 11:15:17 +0100 Subject: [PATCH] CheckBox and RadioButton: made focused icon better recognizable in **FlatLaf Light** and **Dark** themes by painting a 1px focus border; **Darcula** and **IntelliJ** themes are not changed --- .../resources/com/formdev/flatlaf/FlatDarculaLaf.properties | 1 + .../main/resources/com/formdev/flatlaf/FlatDarkLaf.properties | 2 ++ .../resources/com/formdev/flatlaf/FlatIntelliJLaf.properties | 1 + .../main/resources/com/formdev/flatlaf/FlatLightLaf.properties | 2 ++ flatlaf-testing/dumps/uidefaults/FlatDarculaLaf_1.8.0.txt | 1 + flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0.txt | 1 + flatlaf-testing/dumps/uidefaults/FlatIntelliJLaf_1.8.0.txt | 1 + flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0.txt | 1 + 8 files changed, 10 insertions(+) diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarculaLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarculaLaf.properties index fe3c3949..b2b669aa 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarculaLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarculaLaf.properties @@ -46,6 +46,7 @@ Button.default.boldText = true #---- CheckBox ---- +CheckBox.icon.focusWidth = null CheckBox.icon.focusedBackground = null 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 6ba407e6..5603c832 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties @@ -128,6 +128,8 @@ Button.toolbar.selectedBackground = lighten($Button.background,7%,derived) #---- CheckBox ---- +CheckBox.icon.focusWidth = 1 + # enabled CheckBox.icon.borderColor = tint($Component.borderColor,5%) CheckBox.icon.background = tint(@background,5%) diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatIntelliJLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatIntelliJLaf.properties index 21d3f218..510b9c2e 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatIntelliJLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatIntelliJLaf.properties @@ -54,6 +54,7 @@ Button.default.borderWidth = 1 #---- CheckBox ---- CheckBox.icon.style = filled +CheckBox.icon.focusWidth = null CheckBox.icon.focusedBackground = null 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 7f73d7a4..b87e47d6 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties @@ -131,6 +131,8 @@ Button.toolbar.selectedBackground = $Button.selectedBackground #---- CheckBox ---- +CheckBox.icon.focusWidth = 1 + # enabled CheckBox.icon.borderColor = shade($Component.borderColor,10%) CheckBox.icon.background = @buttonBackground diff --git a/flatlaf-testing/dumps/uidefaults/FlatDarculaLaf_1.8.0.txt b/flatlaf-testing/dumps/uidefaults/FlatDarculaLaf_1.8.0.txt index cbb0c791..8291260a 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatDarculaLaf_1.8.0.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatDarculaLaf_1.8.0.txt @@ -18,6 +18,7 @@ #---- CheckBox ---- +- CheckBox.icon.focusWidth 1 - CheckBox.icon.focusedBackground #446e9e4d 30% HSLA 212 40 44 30 javax.swing.plaf.ColorUIResource [UI] diff --git a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0.txt b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0.txt index aa8743f5..ebe78cbd 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0.txt @@ -128,6 +128,7 @@ CheckBox.icon.checkmarkColor #a8a8a8 HSL 0 0 66 javax.swing.plaf.Colo CheckBox.icon.disabledBackground #3c3f41 HSL 204 4 25 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.disabledBorderColor #545657 HSL 200 2 34 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.disabledCheckmarkColor #686868 HSL 0 0 41 javax.swing.plaf.ColorUIResource [UI] +CheckBox.icon.focusWidth 1 CheckBox.icon.focusedBackground #446e9e4d 30% HSLA 212 40 44 30 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.focusedBorderColor #446e9e HSL 212 40 44 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.hoverBackground #4d5153 HSL 200 4 31 com.formdev.flatlaf.util.DerivedColor [UI] lighten(3% autoInverse) diff --git a/flatlaf-testing/dumps/uidefaults/FlatIntelliJLaf_1.8.0.txt b/flatlaf-testing/dumps/uidefaults/FlatIntelliJLaf_1.8.0.txt index df1a31e8..943c0881 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatIntelliJLaf_1.8.0.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatIntelliJLaf_1.8.0.txt @@ -45,6 +45,7 @@ #---- CheckBox ---- +- CheckBox.icon.focusWidth 1 - CheckBox.icon.focusedBackground #eaf3fb HSL 208 68 95 javax.swing.plaf.ColorUIResource [UI] + CheckBox.icon.style filled diff --git a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0.txt b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0.txt index 105871df..18a37bd7 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0.txt @@ -129,6 +129,7 @@ CheckBox.icon.checkmarkColor #4e9de7 HSL 209 76 61 javax.swing.plaf.Colo CheckBox.icon.disabledBackground #f2f2f2 HSL 0 0 95 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.disabledBorderColor #bfbfbf HSL 0 0 75 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.disabledCheckmarkColor #a9a9a9 HSL 0 0 66 javax.swing.plaf.ColorUIResource [UI] +CheckBox.icon.focusWidth 1 CheckBox.icon.focusedBackground #eaf3fb HSL 208 68 95 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.focusedBorderColor #7b9ebf HSL 209 35 62 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.hoverBackground #f7f7f7 HSL 0 0 97 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse)