From 2640ab2e8b89c6fe2c4694dd2c64e350ea79599d Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Thu, 30 Jul 2020 12:11:15 +0200 Subject: [PATCH] ComboBox: changed maximum row count of popup list to 15 (was 20) (issue #124) --- CHANGELOG.md | 2 ++ .../src/main/resources/com/formdev/flatlaf/FlatLaf.properties | 2 +- .../flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt | 2 +- .../flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfd0bfcc..61590d3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ FlatLaf Change Log - ToolTip: Do not show empty tooltip component if tooltip text is an empty string. (issue #134) - Button: Support specifying button border width. +- ComboBox: Changed maximum row count of popup list to 15 (was 20). Set UI value + `ComboBox.maximumRowCount` to any integer to use a different value. ## 0.38 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 776d557c..25525fbb 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties @@ -181,7 +181,7 @@ ComboBox.border=com.formdev.flatlaf.ui.FlatRoundBorder ComboBox.padding=2,6,2,6 ComboBox.minimumWidth=72 ComboBox.editorColumns=0 -ComboBox.maximumRowCount=20 +ComboBox.maximumRowCount=15 [mac]ComboBox.showPopupOnNavigation=true ComboBox.buttonStyle=auto diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt index 1f81a626..4e0ea56d 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt @@ -197,7 +197,7 @@ ComboBox.editorColumns 0 ComboBox.font [active] $defaultFont [UI] ComboBox.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] ComboBox.isEnterSelectablePopup false -ComboBox.maximumRowCount 20 +ComboBox.maximumRowCount 15 ComboBox.minimumWidth 72 ComboBox.noActionOnKeyNavigation false ComboBox.padding 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI] diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt index 785c40e6..6e90d26e 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt @@ -201,7 +201,7 @@ ComboBox.editorColumns 0 ComboBox.font [active] $defaultFont [UI] ComboBox.foreground #000000 javax.swing.plaf.ColorUIResource [UI] ComboBox.isEnterSelectablePopup false -ComboBox.maximumRowCount 20 +ComboBox.maximumRowCount 15 ComboBox.minimumWidth 72 ComboBox.noActionOnKeyNavigation false ComboBox.padding 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI]