Merge lp:~3v1n0/unity-greeter/shutdown-fade into lp:unity-greeter

[Marco Trevisan (Treviño)]

ShutdownDialog: fade-in/out the dialog when opening/closing it

The old "close" signal is now a method, while the view actually closes
on "closed" signal callback in main window.

Fade the shutdown dialog in/out when showing/hiding it.

Changed the behavior of the AnimateTimer so that it won't stop if the easing curve value reaches the 1.0f progress (it might be only a peek, depending on the easing curve we use); always care about time progress only instead.

[Robert Ancell (robert-ancell)]

Incorrect indentatin
121 + if (p >= 1.0f)
122 + {
123 + animation.stop ();
124 + closed ();
125 + }

Otherwise works great!

review: Approve

[Robert Ancell (robert-ancell)]

(Doesn't need a re-review once indentation fixed)

review: Needs Fixing

[Marco Trevisan (Treviño) (3v1n0)]

Ups, pushed the fix.

[Robert Ancell (robert-ancell)]

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

Merged with parent branch to fix conflicts... Reapproving myself.

=== modified file 'src/animate-timer.vala'
--- src/animate-timer.vala	2013-06-19 20:08:25 +0000
+++ src/animate-timer.vala	2013-11-13 04:28:56 +0000
@@ -58,6 +58,11 @@
         this.easing_func = func;
     }
 
+    ~AnimateTimer ()
+    {
+        stop ();
+    }
+
     /* temp_speed is in milliseconds */
     public void reset (int temp_speed = -1)
     {
@@ -93,10 +98,11 @@
         if (start_time == 0)
             start_time = GLib.get_monotonic_time ();
 
-        progress = calculate_progress (GLib.get_monotonic_time ());
+        var time_progress = normalize_time (GLib.get_monotonic_time ());
+        progress = calculate_progress (time_progress);
         animate (progress);
 
-        if (progress >= 1.0)
+        if (time_progress >= 1.0)
         {
             timeout = 0;
             return false;
@@ -108,17 +114,17 @@
     /* Returns 0.0 to 1.0 where 1.0 is at or past end_time */
     private double normalize_time (TimeSpan now)
     {
+        if (length == 0)
+            return 1.0f;
+
         return (((double)(now - start_time)) / length).clamp (0.0, 1.0);
     }
 
     /* Returns 0.0 to 1.0 where 1.0 is done.
        time is not normalized yet! */
-    private double calculate_progress (TimeSpan time)
+    private double calculate_progress (double time_progress)
     {
-        if (length == 0)
-            return 1.0;
-        var x = normalize_time (time);
-        var y = easing_func (x);
+        var y = easing_func (time_progress);
         return y.clamp (0.0, 1.0);
     }
 

=== modified file 'src/main-window.vala'
--- src/main-window.vala	2013-11-13 04:28:56 +0000
+++ src/main-window.vala	2013-11-13 04:28:56 +0000
@@ -343,10 +343,10 @@
         login_box.sensitive = false;
 
         shutdown_dialog = new ShutdownDialog (type, background);
-        shutdown_dialog.visible = true;
-        shutdown_dialog.close.connect (close_shutdown_dialog);
+        shutdown_dialog.closed.connect (close_shutdown_dialog);
         background.add (shutdown_dialog);
         move_to_monitor (active_monitor);
+        shutdown_dialog.visible = true;
     }
 
     public void close_shutdown_dialog ()

=== modified file 'src/shutdown-dialog.vala'
--- src/shutdown-dialog.vala	2013-11-13 04:28:56 +0000
+++ src/shutdown-dialog.vala	2013-11-13 04:28:56 +0000
@@ -27,7 +27,7 @@
 
 public class ShutdownDialog : Gtk.Fixed
 {
-    public signal void close ();
+    public signal void closed ();
 
     private Cairo.ImageSurface? bg_surface = null;
     private Cairo.ImageSurface? corner_surface = null;
@@ -53,6 +53,8 @@
     private Gtk.EventBox monitor_events;
     private Gtk.EventBox vbox_events;
 
+    private AnimateTimer animation;
+    private bool closing = false;
 
     public ShutdownDialog (ShutdownDialogType type, Background bg)
     {
@@ -188,6 +190,9 @@
                     warning ("Failed to shutdown: %s", e.message);
                 }
             });
+
+            if (type != ShutdownDialogType.SHUTDOWN)
+                show.connect(() => { button.grab_focus (); });
         }
 
         close_button = new DialogButton (Path.build_filename (Config.PKGDATADIR, "dialog_close.png"), Path.build_filename (Config.PKGDATADIR, "dialog_close_highlight.png"), Path.build_filename (Config.PKGDATADIR, "dialog_close_press.png"));
@@ -195,6 +200,29 @@
         close_button.clicked.connect (() => { close (); });
         close_button.visible = true;
         add (close_button);
+
+        animation = new AnimateTimer ((x) => { return x; }, AnimateTimer.INSTANT);
+        animation.animate.connect (() => { queue_draw (); });
+        show.connect (() => { animation.reset(); });
+    }
+
+    public void close ()
+    {
+        var start_value = 1.0f - animation.progress;
+        animation = new AnimateTimer ((x) => { return start_value + x; }, AnimateTimer.INSTANT);
+        animation.animate.connect ((p) =>
+        {
+            queue_draw ();
+
+            if (p >= 1.0f)
+            {
+                animation.stop ();
+                closed ();
+            }
+        });
+
+        closing = true;
+        animation.reset();
     }
 
     private void rebuild_background ()
@@ -276,11 +304,14 @@
         int x = (get_allocated_width () - width) / 2;
         int y = (get_allocated_height () - height) / 2;
 
+        if (animation.is_running)
+            c.push_group ();
+
         /* Darken background */
         c.set_source_rgba (0, 0, 0, 0.25);
         c.paint ();
 
-        if (bg_surface == null)
+        if (bg_surface == null || animation.is_running)
         {
             /* Create a new blurred surface of the current surface */
             bg_surface = new Cairo.ImageSurface (Cairo.Format.ARGB32, width, height);
@@ -385,7 +416,15 @@
 
         c.restore ();
 
-        return base.draw (c);
+        var ret = base.draw (c);
+
+        if (animation.is_running)
+        {
+            c.pop_group_to_source ();
+            c.paint_with_alpha (closing ? 1.0f - animation.progress : animation.progress);
+        }
+
+        return ret;
     }
 
     private DialogButton add_button (string text, string inactive_filename, string active_filename)