Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-07 14:30:56 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

ComboBox: renamed UI key ComboBox.popupFocusedBackground to ComboBox.popupBackground

Browse Source
This commit is contained in:
Karl Tauber
2021-06-22 08:59:11 +02:00
parent 8a72b30cbc
commit 2a732306a1
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,7 +103,7 @@ import com.formdev.flatlaf.util.UIScale;
* @uiDefault ComboBox.buttonDisabledArrowColor Color * @uiDefault ComboBox.buttonDisabledArrowColor Color
* @uiDefault ComboBox.buttonHoverArrowColor Color * @uiDefault ComboBox.buttonHoverArrowColor Color
* @uiDefault ComboBox.buttonPressedArrowColor Color * @uiDefault ComboBox.buttonPressedArrowColor Color
* @uiDefault ComboBox.popupFocusedBackground Color optional * @uiDefault ComboBox.popupBackground Color optional
* *
* @author Karl Tauber * @author Karl Tauber
*/ */
@@ -131,7 +131,7 @@ public class FlatComboBoxUI
protected Color buttonHoverArrowColor; protected Color buttonHoverArrowColor;
protected Color buttonPressedArrowColor; protected Color buttonPressedArrowColor;
protected Color popupFocusedBackground; protected Color popupBackground;
private MouseListener hoverListener; private MouseListener hoverListener;
protected boolean hover; protected boolean hover;
@@ -215,7 +215,7 @@ public class FlatComboBoxUI
buttonHoverArrowColor = UIManager.getColor( "ComboBox.buttonHoverArrowColor" ); buttonHoverArrowColor = UIManager.getColor( "ComboBox.buttonHoverArrowColor" );
buttonPressedArrowColor = UIManager.getColor( "ComboBox.buttonPressedArrowColor" ); buttonPressedArrowColor = UIManager.getColor( "ComboBox.buttonPressedArrowColor" );
popupFocusedBackground = UIManager.getColor( "ComboBox.popupFocusedBackground" ); popupBackground = UIManager.getColor( "ComboBox.popupBackground" );
// set maximumRowCount // set maximumRowCount
int maximumRowCount = UIManager.getInt( "ComboBox.maximumRowCount" ); int maximumRowCount = UIManager.getInt( "ComboBox.maximumRowCount" );
@@ -248,7 +248,7 @@ public class FlatComboBoxUI
buttonHoverArrowColor = null; buttonHoverArrowColor = null;
buttonPressedArrowColor = null; buttonPressedArrowColor = null;
popupFocusedBackground = null; popupBackground = null;
MigLayoutVisualPadding.uninstall( comboBox ); MigLayoutVisualPadding.uninstall( comboBox );
} }
@@ -727,8 +727,8 @@ public class FlatComboBoxUI
super.configureList(); super.configureList();
list.setCellRenderer( new PopupListCellRenderer() ); list.setCellRenderer( new PopupListCellRenderer() );
if( popupFocusedBackground != null ) if( popupBackground != null )
list.setBackground( popupFocusedBackground ); list.setBackground( popupBackground );
} }
@Override @Override

2
flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties
View File

@@ -132,7 +132,7 @@ ComboBox.buttonEditableBackground = #ccc
ComboBox.focusedBackground = #ff8 ComboBox.focusedBackground = #ff8
ComboBox.buttonFocusedBackground = #ff0 ComboBox.buttonFocusedBackground = #ff0
ComboBox.popupFocusedBackground = #ffc ComboBox.popupBackground = #ffc
#---- Component ---- #---- Component ----