diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-04 20:44:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-04 20:44:01 +0000 |
| commit | fb5a02906f644d044eb0286bf27d413ba0e05216 (patch) | |
| tree | bca7d49005d81d10c70bc3f547df041c636b4300 /platform/platform-api/src/com/intellij/util/ui/StatusText.java | |
| parent | 9cde0e3c015174898df8b8f3672185941fad4786 (diff) | |
| parent | d245f58efbfc26b13b9b9d5e52e6a83a0d76216c (diff) | |
| download | idea-fb5a02906f644d044eb0286bf27d413ba0e05216.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/platform-api/src/com/intellij/util/ui/StatusText.java')
| -rw-r--r-- | platform/platform-api/src/com/intellij/util/ui/StatusText.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/platform-api/src/com/intellij/util/ui/StatusText.java b/platform/platform-api/src/com/intellij/util/ui/StatusText.java index 60f8c5c6cbc1..479b968d4317 100644 --- a/platform/platform-api/src/com/intellij/util/ui/StatusText.java +++ b/platform/platform-api/src/com/intellij/util/ui/StatusText.java @@ -186,7 +186,8 @@ public abstract class StatusText { } public void paint(Component owner, Graphics g) { - if (!isStatusVisible() || owner != myOwner) return; + boolean wrongComponent = owner != myOwner && owner != null && owner.getParent() != myOwner; + if (!isStatusVisible() || wrongComponent) return; Rectangle b = getTextComponentBound(); myComponent.setBounds(0, 0, b.width, b.height); |