From cbdc762912bcf9185d9eec5676bf770e6037da0c Mon Sep 17 00:00:00 2001 From: "Gregory.Shrago" Date: Wed, 8 Apr 2015 18:56:22 +0300 Subject: [PATCH] NPE when no clip is set --- .../src/com/intellij/openapi/wm/impl/PaintersHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/PaintersHelper.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/PaintersHelper.java index 7260c99b5461..2a33099f6f71 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/PaintersHelper.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/PaintersHelper.java @@ -23,6 +23,7 @@ import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ImageLoader; +import com.intellij.util.ObjectUtils; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; @@ -78,11 +79,10 @@ final class PaintersHelper implements Painter.Listener { public void paint(Graphics g, JComponent current) { if (myPainters.isEmpty()) return; + Rectangle clip = ObjectUtils.notNull(g.getClipBounds(), current.getBounds()); Graphics2D g2d = (Graphics2D)g; for (Painter painter : myPainters) { - Rectangle clip = g.getClipBounds(); - Component component = myPainter2Component.get(painter); if (component.getParent() == null) continue; Rectangle componentBounds = SwingUtilities.convertRectangle(component.getParent(), component.getBounds(), current);