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

Combobox in table: popup shouldn't lose focus while opening

Browse Source
This commit is contained in:
Alexander Zolotov
2015-02-04 21:04:53 +03:00
parent b7541cc852
commit bec29612ac
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/ui/components/editors/JBComboBoxTableCellEditorComponent.java
+17
View File
@@ -16,7 +16,9 @@
package com.intellij.ui.components.editors;
import com.intellij.openapi.ui.popup.JBPopup;
import com.intellij.openapi.ui.popup.JBPopupAdapter;
import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.ui.popup.LightweightWindowEvent;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.ui.TableUtil;
@@ -24,6 +26,7 @@ import com.intellij.ui.awt.RelativePoint;
import com.intellij.ui.components.JBComboBoxLabel;
import com.intellij.ui.components.JBLabel;
import com.intellij.ui.components.JBList;
import com.intellij.ui.table.JBTable;
import com.intellij.util.Function;
import com.intellij.util.PlatformIcons;
import com.intellij.util.containers.ContainerUtil;
@@ -138,6 +141,7 @@ public class JBComboBoxTableCellEditorComponent extends JBLabel {
if (myRenderer != null) {
myList.setCellRenderer(myRenderer);
}
final boolean surrendersFocusOnKeystrokeOldValue = myTable instanceof JBTable ? ((JBTable)myTable).surrendersFocusOnKeyStroke() : myTable.getSurrendersFocusOnKeystroke();
final JBPopup popup = JBPopupFactory.getInstance()
.createListPopupBuilder(myList)
.setItemChoosenCallback(new Runnable() {
@@ -161,6 +165,19 @@ public class JBComboBoxTableCellEditorComponent extends JBLabel {
return true;
}
})
.addListener(new JBPopupAdapter() {
@Override
public void beforeShown(LightweightWindowEvent event) {
super.beforeShown(event);
myTable.setSurrendersFocusOnKeystroke(false);
}
@Override
public void onClosed(LightweightWindowEvent event) {
myTable.setSurrendersFocusOnKeystroke(surrendersFocusOnKeystrokeOldValue);
super.onClosed(event);
}
})
.createPopup();
final Rectangle rect = myTable.getCellRect(myRow, myColumn, true);
Point point = new Point(rect.x, rect.y);