Merge lp:~voldyman/pantheon-greeter/no-animate into lp:~elementary-pantheon/pantheon-greeter/trunk

[Akshay Shekher]

Actor.animate is deprecated, stop using it.

Actor.animate is deprecated, stop using it.

[lp:~voldyman/pantheon-greeter/no-animate]

397. By Akshay Shekher on 2015-10-06

stoped using actor.animate as it's deprecated

[kay van der Zander (kay20)]

Hey nice work.

I saw white lines on diff line 16 and 66. Please remove this one.
On diff line 57 sins you are here could you add the brackets around the if statement?

review: Needs Fixing (code)

[kay van der Zander (kay20)]

Oh i missed one line 74 also a white line remove it please. Other white lines are fine because they give a separation from other pieces of code.

[lp:~voldyman/pantheon-greeter/no-animate]

398. By Akshay Shekher on 2015-10-07

removed extra blank lines, added brackets

=== modified file 'src/Avatar.vala'
--- src/Avatar.vala	2015-07-12 23:31:17 +0000
+++ src/Avatar.vala	2015-10-07 05:55:27 +0000
@@ -113,17 +113,28 @@
         this.contents = box;
     }
 
-    public unowned Clutter.Animation fade_in () {
-        return animate (Clutter.AnimationMode.EASE_IN_OUT_QUAD, 400, "opacity", 255);
+    public void fade_in () {
+        save_easing_state ();
+        set_easing_mode (Clutter.AnimationMode.EASE_IN_OUT_QUAD);
+        set_easing_duration (400);
+        set_opacity (255);
+        restore_easing_state ();
     }
 
-    public unowned Clutter.Animation fade_out () {
-        return animate (Clutter.AnimationMode.EASE_IN_OUT_QUAD, 400, "opacity", 0);
+    public void fade_out () {
+        save_easing_state ();
+        set_easing_mode (Clutter.AnimationMode.EASE_IN_OUT_QUAD);
+        set_easing_duration (400);
+        set_opacity (0);
+        restore_easing_state ();
     }
 
     public void dismiss () {
-        fade_out ().completed.connect (() => {
+        fade_out ();
+        ulong sid = 0;
+        sid = transitions_completed.connect (() => {
             get_parent ().remove_child (this);
+            disconnect (sid);
         });
     }
 

=== modified file 'src/LoginBox.vala'
--- src/LoginBox.vala	2015-07-12 23:01:27 +0000
+++ src/LoginBox.vala	2015-10-07 05:55:27 +0000
@@ -48,14 +48,31 @@
                 // will display a Gtk.Entry for that and we need to hide
                 // the label that would otherwise be at the same position
                 // as the mentioned entry.
-                if (!user.provides_login_name)
-                    label.animate (Clutter.AnimationMode.EASE_IN_OUT_QUAD, 200, "opacity", 0);
+                if (!user.provides_login_name) {
+                    label.save_easing_state ();
+                    label.set_easing_mode (Clutter.AnimationMode.EASE_IN_OUT_QUAD);
+                    label.set_easing_duration (200);
+                    label.set_opacity (0);
+                    label.restore_easing_state ();
+                }
             } else {
-                if (avatar != null)
+
+                if (avatar != null) {
                     avatar.deselect ();
-                label.animate (Clutter.AnimationMode.EASE_IN_OUT_QUAD, 200, "opacity", 255);
+                }
+
+                label.save_easing_state ();
+                label.set_easing_mode (Clutter.AnimationMode.EASE_IN_OUT_QUAD);
+                label.set_easing_duration (200);
+                label.set_opacity (255);
+                label.restore_easing_state ();
             }
-            credentials_actor.animate (Clutter.AnimationMode.EASE_IN_OUT_QUAD, 200, "opacity", opacity);
+
+            credentials_actor.save_easing_state ();
+            credentials_actor.set_easing_mode (Clutter.AnimationMode.EASE_IN_OUT_QUAD);
+            credentials_actor.set_easing_duration (200);
+            credentials_actor.opacity = opacity;
+            credentials_actor.restore_easing_state ();
         }
     }
 

=== modified file 'src/PantheonGreeter.vala'
--- src/PantheonGreeter.vala	2015-04-23 06:09:09 +0000
+++ src/PantheonGreeter.vala	2015-10-07 05:55:27 +0000
@@ -213,7 +213,11 @@
 
         scroll_event.connect (scroll_navigation);
 
-        greeterbox.animate (Clutter.AnimationMode.EASE_OUT_QUART, 250, opacity: 255);
+        greeterbox.save_easing_state ();
+        greeterbox.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUART);
+        greeterbox.set_easing_duration (250);
+        greeterbox.set_opacity (255);
+        greeterbox.restore_easing_state ();
 
         message ("Selecting last used user...");
 

=== modified file 'src/UserListActor.vala'
--- src/UserListActor.vala	2014-10-09 17:44:34 +0000
+++ src/UserListActor.vala	2015-10-07 05:55:27 +0000
@@ -85,7 +85,12 @@
         for (int i = 0; i < userlist.size; i++) {
             LoginOption user = userlist.get_user (i);
             LoginBox box = boxes.get (user);
-            box.animate (Clutter.AnimationMode.EASE_IN_OUT_QUAD, 300, y: y_vars[i]);
+
+            box.save_easing_state ();
+            box.set_easing_mode (Clutter.AnimationMode.EASE_IN_OUT_QUAD);
+            box.set_easing_duration (300);
+            box.y = y_vars[i];
+            box.restore_easing_state ();
 
             box.selected = (user == current_user);
             if (user == current_user) {

=== modified file 'src/Utilities.vala'
--- src/Utilities.vala	2014-07-09 10:25:25 +0000
+++ src/Utilities.vala	2015-10-07 05:55:27 +0000
@@ -191,9 +191,13 @@
         });
 
         this.leave_event.connect (() => {
-            this.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 200, opacity:0).
+            this.save_easing_state ();
+            this.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
+            this.set_easing_duration (200);
+            this.set_opacity (0);
+            this.restore_easing_state ();
 
-            completed.connect (() => {
+            transitions_completed.connect (() => {
                 this.get_stage ().remove_child (this);
                 this.destroy ();
             });
@@ -202,7 +206,13 @@
         });
 
         this.opacity = 0;
-        this.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 200, opacity:255);
+
+        this.save_easing_state ();
+        this.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
+        this.set_easing_duration (200);
+        this.set_opacity (255);
+        this.restore_easing_state ();
+
     }
 
     public Gtk.Widget get_content_area () {

=== modified file 'src/Wallpaper.vala'
--- src/Wallpaper.vala	2015-04-22 21:10:35 +0000
+++ src/Wallpaper.vala	2015-10-07 05:55:27 +0000
@@ -114,15 +114,30 @@
             new_wallpaper.set_from_pixbuf (buf);
             resize (new_wallpaper);
             add_child (new_wallpaper);
-            new_wallpaper.animate (Clutter.AnimationMode.EASE_OUT_QUINT, 500, opacity: 255);
+
+            new_wallpaper.save_easing_state ();
+            new_wallpaper.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUINT);
+            new_wallpaper.set_easing_duration (500);
+            new_wallpaper.set_opacity (255);
+            new_wallpaper.restore_easing_state ();
 
             // abort all currently loading wallpapers
             foreach (var c in loading_wallpapers) {
                 c.cancel ();
             }
+
             foreach (var other_wallpaper in wallpapers) {
                 wallpapers.remove (other_wallpaper);
-                other_wallpaper.animate (Clutter.AnimationMode.EASE_IN_QUINT, 500, opacity: 0).completed.connect (() => {
+
+                other_wallpaper.save_easing_state ();
+                other_wallpaper.set_easing_mode (Clutter.AnimationMode.EASE_IN_QUINT);
+                other_wallpaper.set_easing_duration (500);
+                other_wallpaper.set_opacity (0);
+                other_wallpaper.restore_easing_state ();
+
+                ulong sid = 0;
+                sid = other_wallpaper.transitions_completed.connect (() => {
+                    other_wallpaper.disconnect (sid);
                     remove_child (other_wallpaper);
                     unused_wallpapers.push_tail (other_wallpaper);
                 });