From 94d548f7ffb68b7a20ee737bfba10813536af9cf Mon Sep 17 00:00:00 2001 From: Sergey Simonchik Date: Tue, 14 May 2019 21:12:46 +0300 Subject: [PATCH] IDEA-CR-47180: combobox: install key listener for custom editors Previously, key listeners were installed for default editors only. And unregistered if combobox.setEditor(myEditor) was called. (cherry picked from commit d2e805ed4ce83d6a38323dcd3dc9b2ebe1bfec67) GitOrigin-RevId: 8fec1dc06ebea24f477c0fe318d1c3bc880d876b --- .../com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java | 2 +- .../com/intellij/ide/ui/laf/intellij/WinIntelliJComboBoxUI.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java index bf986a949457..bc54dbd82862 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java @@ -358,7 +358,6 @@ public class DarculaComboBoxUI extends BasicComboBoxUI implements Border, ErrorB tf.setColumns(0); } - installEditorKeyListener(comboBoxEditor); return comboBoxEditor; } @@ -509,6 +508,7 @@ public class DarculaComboBoxUI extends BasicComboBoxUI implements Border, ErrorB protected void configureEditor() { super.configureEditor(); + installEditorKeyListener(comboBox.getEditor()); if (editor instanceof JComponent) { JComponent jEditor = (JComponent)editor; jEditor.setOpaque(false); diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJComboBoxUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJComboBoxUI.java index 315a049637dc..d6475ab38050 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJComboBoxUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJComboBoxUI.java @@ -334,7 +334,6 @@ public class WinIntelliJComboBoxUI extends DarculaComboBoxUI { } }; - installEditorKeyListener(comboBoxEditor); return comboBoxEditor; } @@ -342,6 +341,7 @@ public class WinIntelliJComboBoxUI extends DarculaComboBoxUI { protected void configureEditor() { super.configureEditor(); + installEditorKeyListener(comboBox.getEditor()); if (editor instanceof JComponent) { JComponent jEditor = (JComponent)editor; jEditor.setBorder(DEFAULT_EDITOR_BORDER);