angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-13 07:17:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

ComboBox: fixed NPE in combobox with custom renderer after switching to FlatLaf (#16; regression in 0.14)

Browse Source
This commit is contained in:
Karl Tauber
2019-10-21 17:04:23 +02:00
parent b56f462626
commit 964dc14a8a
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -1,6 +1,12 @@
FlatLaf Change Log FlatLaf Change Log
================== ==================
## Unreleased
- ComboBox: Fixed NPE in combobox with custom renderer after switching to
FlatLaf. (issue #16; regression in 0.14)
## 0.14 ## 0.14
- ComboBox: Use small border if used as table editor. - ComboBox: Use small border if used as table editor.

5
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java
View File

@@ -370,7 +370,6 @@ public class FlatComboBoxUI
extends BasicComboPopup extends BasicComboPopup
{ {
private CellPaddingBorder paddingBorder; private CellPaddingBorder paddingBorder;
private final ListCellRenderer renderer = new PopupListCellRenderer();
FlatComboPopup( JComboBox combo ) { FlatComboPopup( JComboBox combo ) {
super( combo ); super( combo );
@@ -405,7 +404,7 @@ public class FlatComboBoxUI
protected void configureList() { protected void configureList() {
super.configureList(); super.configureList();
list.setCellRenderer( renderer ); list.setCellRenderer( new PopupListCellRenderer() );
} }
@Override @Override
@@ -416,7 +415,7 @@ public class FlatComboBoxUI
super.propertyChange( e ); super.propertyChange( e );
if( e.getPropertyName() == "renderer" ) if( e.getPropertyName() == "renderer" )
list.setCellRenderer( renderer ); list.setCellRenderer( new PopupListCellRenderer() );
} }
}; };
} }