From 47b3fc432e11bc3a348d1a2a86b4354672c9fdc4 Mon Sep 17 00:00:00 2001 From: Sergey Savenko Date: Tue, 9 Sep 2014 14:04:02 +0400 Subject: [PATCH] DBE-776: TableExpandableItemsHandler: do not expand cells being edited --- .../src/com/intellij/ui/TableExpandableItemsHandler.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/ui/TableExpandableItemsHandler.java b/platform/platform-impl/src/com/intellij/ui/TableExpandableItemsHandler.java index b7704a687441..6099561c7283 100644 --- a/platform/platform-impl/src/com/intellij/ui/TableExpandableItemsHandler.java +++ b/platform/platform-impl/src/com/intellij/ui/TableExpandableItemsHandler.java @@ -16,6 +16,7 @@ package com.intellij.ui; import com.intellij.openapi.util.Pair; +import org.jetbrains.annotations.Nullable; import javax.swing.*; import javax.swing.event.ListSelectionEvent; @@ -105,8 +106,11 @@ public class TableExpandableItemsHandler extends AbstractExpandableItemsHandler< return myComponent.getCellRect(tableCellKey.row, tableCellKey.column, false); } + @Nullable public Pair getCellRendererAndBounds(TableCell key) { - if (key.row < 0 || key.row >= myComponent.getRowCount() || key.column < 0 || key.column >= myComponent.getColumnCount()) { + if (key.row < 0 || key.row >= myComponent.getRowCount() || + key.column < 0 || key.column >= myComponent.getColumnCount() || + key.row == myComponent.getEditingRow() && key.column == myComponent.getEditingColumn()) { return null; }