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

Merge remote-tracking branch 'origin/release-1.6.4' into main

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Karl Tauber
2021-11-16 15:52:15 +01:00
parent df905a1d73 6c0b122fbc
commit 0a765a35bf
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -591,11 +591,8 @@ public class FlatComboBoxUI
// make renderer component temporary non-opaque to avoid that renderer paints
// background outside of border if combobox uses larger arc for edges
// (e.g. FlatClientProperties.COMPONENT_ROUND_RECT is true)
boolean oldOpaque = true;
if( c instanceof JComponent ) {
oldOpaque = ((JComponent)c).isOpaque();
if( c instanceof JComponent )
((JComponent)c).setOpaque( false );
}
boolean shouldValidate = (c instanceof JPanel);
@@ -604,7 +601,7 @@ public class FlatComboBoxUI
paddingBorder.uninstall();
if( c instanceof JComponent )
((JComponent)c).setOpaque( oldOpaque );
((JComponent)c).setOpaque( true );
}
@Override