diff options
Diffstat (limited to 'platform/platform-api/src/com/intellij/ui/table/JBTable.java')
| -rw-r--r-- | platform/platform-api/src/com/intellij/ui/table/JBTable.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/platform-api/src/com/intellij/ui/table/JBTable.java b/platform/platform-api/src/com/intellij/ui/table/JBTable.java index bda230eb767e..c1146be40aba 100644 --- a/platform/platform-api/src/com/intellij/ui/table/JBTable.java +++ b/platform/platform-api/src/com/intellij/ui/table/JBTable.java @@ -424,7 +424,7 @@ public class JBTable extends JTable implements ComponentWithEmptyText, Component if (e instanceof KeyEvent) { // do not start editing in autoStartsEdit mode on Ctrl-Z and other non-typed events - if (!UIUtil.isReallyTypedEvent((KeyEvent)e)) return false; + if (!UIUtil.isReallyTypedEvent((KeyEvent)e) || ((KeyEvent)e).getKeyChar() == KeyEvent.CHAR_UNDEFINED) return false; SpeedSearchSupply supply = SpeedSearchSupply.getSupply(this); if (supply != null && supply.isPopupActive()) { @@ -743,7 +743,7 @@ public class JBTable extends JTable implements ComponentWithEmptyText, Component @Override public void setColor(Color color) { - if (!UIUtil.isUnderDarcula() || !JBTable.this.getBackground().equals(color)) { + if (color != null && (!UIUtil.isUnderDarcula() || !JBTable.this.getBackground().equals(color))) { //noinspection UseJBColor color = new Color(UIUtil.getGrayFilter().filterRGB(0, 0, color.getRGB())); } |