From 4cdc995a7f40eaa572ac1e8848c50c6113cc4936 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Mon, 5 Jul 2021 23:14:05 +0200 Subject: [PATCH] ComboBox: simplified code in configureEditor() --- .../java/com/formdev/flatlaf/ui/FlatComboBoxUI.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java index 840a57bf..5d84415b 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java @@ -356,13 +356,9 @@ public class FlatComboBoxUI protected void configureEditor() { super.configureEditor(); - if( editor instanceof JTextField ) { - JTextField textField = (JTextField) editor; - - // remove default text field border from editor - if( textField.getBorder() instanceof FlatTextBorder ) - textField.setBorder( BorderFactory.createEmptyBorder() ); - } + // remove default text field border from editor + if( editor instanceof JTextField && ((JTextField)editor).getBorder() instanceof FlatTextBorder ) + ((JTextField)editor).setBorder( BorderFactory.createEmptyBorder() ); // explicitly make non-opaque if( editor instanceof JComponent ) @@ -554,7 +550,6 @@ public class FlatComboBoxUI @Override protected Dimension getDisplaySize() { - paddingBorder.uninstall(); Dimension displaySize = super.getDisplaySize(); paddingBorder.uninstall();