MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-173312 NPE on switching theme to Darcula at first time

Browse Source
This commit is contained in:
Kirill Kirichenko
2017-05-25 17:31:14 +03:00
parent d0180fe97b
commit b7cd68b494
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJComboBoxUI.java
+8 -11
View File
@@ -48,20 +48,18 @@ public class MacIntelliJComboBoxUI extends BasicComboBoxUI {
private PropertyChangeListener myEditorBorderChangeListener;
private PropertyChangeListener myEditableChangeListener;
public MacIntelliJComboBoxUI(JComboBox comboBox) {
this.comboBox = comboBox;
this.DEFAULT_ICON = EmptyIcon.create(MacIntelliJIconCache.getIcon("comboRight", comboBox.isEditable(), false, false, true));
comboBox.setOpaque(false);
}
@SuppressWarnings({"MethodOverridesStaticMethodOfSuperclass", "UnusedDeclaration"})
public static ComponentUI createUI(JComponent c) {
return new MacIntelliJComboBoxUI((JComboBox)c);
return new MacIntelliJComboBoxUI();
}
@Override
public void installUI(final JComponent c) {
super.installUI(c);
DEFAULT_ICON = EmptyIcon.create(MacIntelliJIconCache.getIcon("comboRight", comboBox.isEditable(), false, false, true));
comboBox.setOpaque(false);
myEditorBorderChangeListener = (evt) -> {
Object value = evt.getNewValue();
if (value == ourDefaultEditorBorder) return;
@@ -171,10 +169,9 @@ public class MacIntelliJComboBoxUI extends BasicComboBoxUI {
@Override
public Color getBackground() {
if (!comboBox.isEnabled()) {
return UIManager.getColor("ComboBox.disabledBackground");
}
return super.getBackground();
return (comboBox != null && !comboBox.isEnabled()) ?
UIManager.getColor("ComboBox.disabledBackground") :
super.getBackground();
}
public void setText(String s) {