From 27786ec00a4a8d093b73db98ddd2b47923696aa6 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Wed, 8 Dec 2021 00:53:21 +0100 Subject: [PATCH] UI defaults dumps updated for commits 269eb0ba292e2cbb859cc87fe0b8a3556c12e83e, c9a38f0a1340581b40178a4aa86ef2c2e9a40969 and dd3ffc64b965b88a66c7bdca7ad3da7e0d157e7e --- flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0.txt | 8 +++++++- flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0.txt | 8 +++++++- flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0.txt | 7 ++++++- .../com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt | 2 ++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0.txt b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0.txt index fca8199d..dab44ad6 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0.txt @@ -188,6 +188,12 @@ ColorChooser.swatchesSwatchSize [active] 16,16 javax.swing.plaf.DimensionUIRe ColorChooserUI com.formdev.flatlaf.ui.FlatColorChooserUI +#---- ColumnControlButton ---- + +ColumnControlButton.actionIcon [lazy] 10,10 com.formdev.flatlaf.swingx.icons.FlatColumnControlIcon [UI] +ColumnControlButton.iconColor #a8a8a8 HSL 0 0 66 javax.swing.plaf.ColorUIResource [UI] + + #---- ComboBox ---- ComboBox.background #46494b HSL 204 3 28 javax.swing.plaf.ColorUIResource [UI] @@ -596,7 +602,7 @@ MenuBarUI com.formdev.flatlaf.ui.FlatMenuBarUI #---- MenuItem ---- MenuItem.acceleratorArrowGap 2 -MenuItem.acceleratorDelimiter - +MenuItem.acceleratorDelimiter + MenuItem.acceleratorFont [active] $defaultFont [UI] MenuItem.acceleratorForeground #959595 HSL 0 0 58 javax.swing.plaf.ColorUIResource [UI] MenuItem.acceleratorSelectionForeground #bbbbbb HSL 0 0 73 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 e2162462..df2eb746 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0.txt @@ -192,6 +192,12 @@ ColorChooser.swatchesSwatchSize [active] 16,16 javax.swing.plaf.DimensionUIRe ColorChooserUI com.formdev.flatlaf.ui.FlatColorChooserUI +#---- ColumnControlButton ---- + +ColumnControlButton.actionIcon [lazy] 10,10 com.formdev.flatlaf.swingx.icons.FlatColumnControlIcon [UI] +ColumnControlButton.iconColor #737373 HSL 0 0 45 javax.swing.plaf.ColorUIResource [UI] + + #---- ComboBox ---- ComboBox.background #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] @@ -601,7 +607,7 @@ MenuBarUI com.formdev.flatlaf.ui.FlatMenuBarUI #---- MenuItem ---- MenuItem.acceleratorArrowGap 2 -MenuItem.acceleratorDelimiter - +MenuItem.acceleratorDelimiter + MenuItem.acceleratorFont [active] $defaultFont [UI] MenuItem.acceleratorForeground #4d4d4d HSL 0 0 30 javax.swing.plaf.ColorUIResource [UI] MenuItem.acceleratorSelectionForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] diff --git a/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0.txt b/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0.txt index aff78d85..ac9ff075 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0.txt @@ -197,6 +197,11 @@ ColorChooser.swatchesSwatchSize [active] 16,16 javax.swing.plaf.DimensionUIRe ColorChooserUI com.formdev.flatlaf.ui.FlatColorChooserUI +#---- ColumnControlButton ---- + +ColumnControlButton.actionIcon [lazy] 10,10 com.formdev.flatlaf.swingx.icons.FlatColumnControlIcon [UI] + + #---- ComboBox ---- ComboBox.background #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] @@ -607,7 +612,7 @@ MenuBarUI com.formdev.flatlaf.ui.FlatMenuBarUI #---- MenuItem ---- MenuItem.acceleratorArrowGap 2 -MenuItem.acceleratorDelimiter - +MenuItem.acceleratorDelimiter + MenuItem.acceleratorFont [active] $defaultFont [UI] MenuItem.acceleratorForeground #ff8888 HSL 0 100 77 javax.swing.plaf.ColorUIResource [UI] MenuItem.acceleratorSelectionForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] diff --git a/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt b/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt index 7a884b68..0f7e01c0 100644 --- a/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt +++ b/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt @@ -165,6 +165,8 @@ ColorChooser.swatchesDefaultRecentColor ColorChooser.swatchesRecentSwatchSize ColorChooser.swatchesSwatchSize ColorChooserUI +ColumnControlButton.actionIcon +ColumnControlButton.iconColor ComboBox.ancestorInputMap ComboBox.background ComboBox.border