diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-18 20:40:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-18 20:40:22 +0000 |
| commit | 07d35c37ce79a64bdd905b394d40fc9bbb18fa60 (patch) | |
| tree | e8787c45e494dfcc558faf0f75956f8785c39b94 /platform/platform-impl/src/com/intellij/ui/TableExpandableItemsHandler.java | |
| parent | e222a9e1e66670a56e926a6b0f3e10231eeeb1fb (diff) | |
| parent | b5fb31ef6a38f19404859755dbd2e345215b97bf (diff) | |
| download | idea-07d35c37ce79a64bdd905b394d40fc9bbb18fa60.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/platform-impl/src/com/intellij/ui/TableExpandableItemsHandler.java')
| -rw-r--r-- | platform/platform-impl/src/com/intellij/ui/TableExpandableItemsHandler.java | 6 |
1 files changed, 5 insertions, 1 deletions
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<Component, Rectangle> 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; } |