Commit e23d6032 authored by Konstantin Bulenkov's avatar Konstantin Bulenkov
Browse files

cell editing cancellation should be handled by LaF

parent 0af9dcd7
Showing with 4 additions and 15 deletions
+4 -15
...@@ -37,7 +37,10 @@ import com.intellij.openapi.util.text.StringUtil; ...@@ -37,7 +37,10 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.wm.IdeFocusManager; import com.intellij.openapi.wm.IdeFocusManager;
import com.intellij.openapi.wm.IdeGlassPaneUtil; import com.intellij.openapi.wm.IdeGlassPaneUtil;
import com.intellij.openapi.wm.WindowManager; import com.intellij.openapi.wm.WindowManager;
import com.intellij.ui.*; import com.intellij.ui.ColorUtil;
import com.intellij.ui.IdeBorderFactory;
import com.intellij.ui.JBColor;
import com.intellij.ui.UIBundle;
import com.intellij.ui.border.CustomLineBorder; import com.intellij.ui.border.CustomLineBorder;
import com.intellij.ui.components.JBOptionButton; import com.intellij.ui.components.JBOptionButton;
import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.components.JBScrollPane;
...@@ -1676,20 +1679,6 @@ public abstract class DialogWrapper { ...@@ -1676,20 +1679,6 @@ public abstract class DialogWrapper {
} }
final StackingPopupDispatcher popupDispatcher = StackingPopupDispatcher.getInstance(); final StackingPopupDispatcher popupDispatcher = StackingPopupDispatcher.getInstance();
if (popupDispatcher != null && !popupDispatcher.isPopupFocused()) { if (popupDispatcher != null && !popupDispatcher.isPopupFocused()) {
Component focusOwner = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
JTree tree = UIUtil.getParentOfType(JTree.class, focusOwner);
JTable table = UIUtil.getParentOfType(JTable.class, focusOwner);
if (tree != null && tree.isEditing()) {
tree.cancelEditing();
return;
}
if (table != null && table.isEditing()) {
TableUtil.stopEditing(table);
return;
}
doCancelAction(e); doCancelAction(e);
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment