2 files changed, 14 insertions, 3 deletions
diff --git a/platform/platform-api/src/com/intellij/util/ui/ButtonlessScrollBarUI.java b/platform/platform-api/src/com/intellij/util/ui/ButtonlessScrollBarUI.java
index d73e21e8dc3a..b11ca7f3222f 100644
--- a/platform/platform-api/src/com/intellij/util/ui/ButtonlessScrollBarUI.java
+++ b/platform/platform-api/src/com/intellij/util/ui/ButtonlessScrollBarUI.java
@@ -223,10 +223,10 @@ public class ButtonlessScrollBarUI extends BasicScrollBarUI {
   }
 
   public int getDecrementButtonHeight() {
-    return decrButton.getHeight();
+    return Math.max(0, decrButton.getHeight());
   }
   public int getIncrementButtonHeight() {
-    return incrButton.getHeight();
+    return Math.max(0, incrButton.getHeight());
   }
 
   private void resetRegularThumbAnimator() {
@@ -276,6 +276,16 @@ public class ButtonlessScrollBarUI extends BasicScrollBarUI {
     return new ButtonlessScrollBarUI();
   }
 
+
+  public static BasicScrollBarUI createTransparent() {
+    return new ButtonlessScrollBarUI() {
+      @Override
+      public boolean alwaysShowTrack() {
+        return false;
+      }
+    };
+  }
+
   @Override
   public void installUI(JComponent c) {
     super.installUI(c);
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);