Merge lp:~sindriava+launchpad/pantheon-notify/hover-tweak into lp:~tombeckmann/pantheon-notify/trunk

[Jiří Šebele]

On hover, the notification doesn't disappear anymore. On hover out, the timeout resets to 3 seconds.

=== modified file 'src/pantheon-notify.vala'
--- src/pantheon-notify.vala	2012-04-20 16:23:04 +0000
+++ src/pantheon-notify.vala	2012-04-20 16:55:59 +0000
@@ -114,11 +114,13 @@
         this.width  = WIDTH;
         this.reactive = true;
         
+		uint timer = 0;
+
         //slide in anim
         this.scale_x = 0.0f;
         this.scale_gravity = Clutter.Gravity.EAST;
         this.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 400, scale_x:1.0f).completed.connect ( () => {
-            Timeout.add ((timeout == uint32.MAX)?EXPIRE:timeout, () => {
+            timer = Timeout.add ((timeout == uint32.MAX)?EXPIRE:timeout, () => {
                 this.close ();
                 return false;
             });
@@ -128,6 +130,9 @@
         this.enter_event.connect ( () => {
             closeb.animate (Clutter.AnimationMode.EASE_OUT_ELASTIC, 400, scale_x:1.0f, scale_y:1.0f);
             
+			// Stop the timer
+			Source.remove (timer);
+
             float height;
             text.get_preferred_size (null, null, null, out height);
             var new_h = this.height + (height - text.height) + SHADOW;
@@ -138,7 +143,14 @@
         });
         this.leave_event.connect ( () => {
             closeb.animate (Clutter.AnimationMode.EASE_IN_ELASTIC, 400, scale_x:0.0f, scale_y:0.0f);
-            this.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 400, height:HEIGHT+0.0f);
+            
+			// Reset the timer for 3 seconds
+            timer = Timeout.add ((timeout == uint32.MAX) ? 3000 : timeout, () => {
+                this.close ();
+                return false;
+            });
+			
+			this.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 400, height:HEIGHT+0.0f);
             return true;
         });