From 480ecd3708598f90666be5d25920d700efacbee4 Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Wed, 8 Jun 2016 17:53:41 +0300
Subject: [PATCH] IDEA-155300 Change non-sticky balloons behavior: animation

---
 .../intellij/notification/impl/NotificationsManagerImpl.java | 2 +-
 platform/platform-impl/src/com/intellij/ui/BalloonImpl.java  | 5 ++++-
 platform/util/resources/misc/registry.properties             | 1 -
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java b/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java
index b9b54afb8035..262a9b1be704 100644
--- a/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java
@@ -835,7 +835,7 @@ public class NotificationsManagerImpl extends NotificationsManager {
       .setCloseButtonEnabled(buttons == null)
       .setShowCallout(showCallout)
       .setShadow(false)
-      .setAnimationCycle(Registry.intValue("ide.new.notification.auto.hide.animation.time", 500))
+      .setAnimationCycle(200)
       .setHideOnClickOutside(hideOnClickOutside)
       .setHideOnAction(hideOnClickOutside)
       .setHideOnKeyOutside(hideOnClickOutside)
diff --git a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
index a53fdc7edb4e..1c5a17c9ca3e 100644
--- a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
+++ b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
@@ -1690,12 +1690,15 @@ public class BalloonImpl implements Balloon, IdeTooltip.Ui {
         initComponentImage(pointTarget, shapeBounds);
       }
 
+      if (myImage != null && myAlpha != -1) {
+        g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, myAlpha));
+      }
+
       if (myShadowBorderProvider != null) {
         myShadowBorderProvider.paintShadow(this, g);
       }
 
       if (myImage != null && myAlpha != -1) {
-        g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, myAlpha));
         paintShadow(g);
         UIUtil.drawImage(g2d, myImage, 0, 0, null);
       }
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 4fd1f4d5e303..8c1b86176960 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -488,7 +488,6 @@ ide.ui.scale=1.0
 
 ide.new.notification.enabled=true
 ide.new.notification.visible.count=2
-ide.new.notification.auto.hide.animation.time=500
 
 ide.open.file.in.temp.project.dir=true
 ide.open.file.in.temp.project.dir.description=Enables opening file in temp project directory