eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-03 05:39:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleaning up color selections and debugging the combo box

Browse Source
This commit is contained in:
Ben Fry
2022-05-03 18:20:18 -04:00
parent 6c3fbc5c8d
commit a2f3e53a04
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/processing/app/laf/PdeComboBoxUI.java
View File

@@ -82,22 +82,23 @@ public class PdeComboBoxUI extends BasicComboBoxUI {
c.setBackground(enabledBgColor);
}
c.setFont(comboBox.getFont());
if (hasFocus && !isPopupVisible(comboBox)) {
//c.setForeground(listBox.getSelectionForeground()); // TODO do we need to mess with listBox?
//c.setBackground(listBox.getSelectionBackground());
c.setForeground(selectedFgColor);
c.setBackground(selectedBgColor);
} else {
// if (hasFocus && !isPopupVisible(comboBox)) {
// //c.setForeground(listBox.getSelectionForeground()); // TODO do we need to mess with listBox?
// //c.setBackground(listBox.getSelectionBackground());
// c.setForeground(selectedFgColor);
// c.setBackground(selectedBgColor);
//
// } else {
if (comboBox.isEnabled()) {
c.setForeground(comboBox.getForeground());
c.setBackground(comboBox.getBackground());
}
else {
// c.setForeground(comboBox.getForeground());
// c.setBackground(comboBox.getBackground());
c.setForeground(enabledFgColor);
c.setBackground(enabledBgColor);
} else {
c.setForeground(disabledFgColor);
c.setBackground(disabledBgColor);
}
}
// }
// Fix for 4238829: should lay out the JPanel.
boolean shouldValidate = c instanceof JPanel;
@@ -135,7 +136,7 @@ public class PdeComboBoxUI extends BasicComboBoxUI {
disabledFgColor = Theme.getColor(prefix + ".disabled.fgcolor");
disabledBgColor = Theme.getColor(prefix + ".disabled.bgcolor");
selectedFgColor = Theme.getColor(prefix + ".selected.fgcolor");
selectedFgColor = Theme.getColor(prefix + ".selected.fgcolor");
selectedBgColor = Theme.getColor(prefix + ".selected.bgcolor");
if (arrowButton.isEnabled()) {
arrowButton.setBackground(enabledBgColor);