Merge lp:~unity-team/unity/less-flashing-places into lp:unity

[Neil J. Patel]

This branch queues requests to remove results from the views long enough to update the existing tiles if add_result comes in. This allows the views not to flash as much during searches.

It's a bit messy but I can clean up next week, nothing there should be evil (well, some might :).

[Gord Allott (gordallott)]

seems to work okay, approved. i don't like the "button.unref (); /* Because Vala sucks and holds references when it shouldn't*/;"'s but i guess they have been there for a while

review: Approve

=== modified file 'unity-private/places/places-button.vala'
--- unity-private/places/places-button.vala	2010-08-26 12:34:12 +0000
+++ unity-private/places/places-button.vala	2010-09-03 00:06:44 +0000
@@ -128,6 +128,7 @@
       cr.close_path ();    }
 
     private void paint_bg (Cairo.Context cr, int width, int height)
+      requires (this is Button)
     {
       var x = 1;
 

=== modified file 'unity-private/places/places-default-renderer-group.vala'
--- unity-private/places/places-default-renderer-group.vala	2010-09-03 00:06:44 +0000
+++ unity-private/places/places-default-renderer-group.vala	2010-09-03 00:06:44 +0000
@@ -73,6 +73,9 @@
 
     public signal void activated (string uri, string mimetype);
 
+    private GLib.List<Tile?> cleanup_tiles = new GLib.List<Tile?> ();
+    private uint cleanup_operation = 0;
+
     public DefaultRendererGroup (uint      group_id,
                                  string    group_renderer,
                                  string    display_name,
@@ -266,8 +269,18 @@
       
       Tile button;
       
-
-      if (group_renderer == "UnityFileInfoRenderer")
+      if (cleanup_tiles.length () > 0)
+        {
+          button = cleanup_tiles.nth_data (0);
+          button.update_details (results.get_string (iter, 0),
+                         results.get_string (iter, 1),
+                         results.get_string (iter, 3),
+                         results.get_string (iter, 4),
+                         results.get_string (iter, 5));
+          button.iter = iter;
+          cleanup_tiles.remove (button);
+        }
+      else if (group_renderer == "UnityFileInfoRenderer")
         {
           button = new FileInfoTile (iter,
                                      results.get_string (iter, 0),
@@ -275,6 +288,11 @@
                                      results.get_string (iter, 3),
                                      results.get_string (iter, 4),
                                      results.get_string (iter, 5));
+
+          renderer.add_actor (button);
+          button.show ();
+          button.unref (); /* Because Vala sucks and holds references when it shouldn't*/;
+          button.activated.connect ((u, m) => { activated (u, m); });
         }
       else if (group_renderer == "UnityShowcaseRenderer")
         {
@@ -284,6 +302,11 @@
                                      results.get_string (iter, 3),
                                      results.get_string (iter, 4),
                                      results.get_string (iter, 5));
+          renderer.add_actor (button);
+          button.show ();
+          button.unref (); /* Because Vala sucks and holds references when it shouldn't*/;
+
+          button.activated.connect ((u, m) => { activated (u, m); });
         }
       else
         {
@@ -293,18 +316,18 @@
                                     results.get_string (iter, 3),
                                     results.get_string (iter, 4),
                                     results.get_string (iter, 5));
+          renderer.add_actor (button);
+          button.show ();
+          button.unref (); /* Because Vala sucks and holds references when it shouldn't*/;
+
+          button.activated.connect ((u, m) => { activated (u, m); });
         }
-      renderer.add_actor (button);
-      button.show ();
-      button.unref (); /* Because Vala sucks and holds references when it shouldn't*/;
 
       if (bin_state == ExpandingBinState.EXPANDED || _always_expanded)
         {
           button.about_to_show ();
         }
 
-      button.activated.connect ((u, m) => { activated (u, m); });
-
       add_to_n_results (1);
 
       if (bin_state == ExpandingBinState.CLOSED)
@@ -319,6 +342,20 @@
       dirty = true;
     }
 
+    private bool cleanup_operation_callback ()
+    {
+      foreach (Tile? tile in cleanup_tiles)
+        {
+          renderer.remove_actor (tile);
+        }
+
+      cleanup_tiles = null;
+      cleanup_tiles = new GLib.List<Tile?> ();
+
+      cleanup_operation = 0;
+      return false;
+    }
+
     private void on_result_removed (Dee.ModelIter iter)
     {
      if (!interesting (iter))
@@ -331,7 +368,10 @@
 
           if (tile.iter == iter)
             {
-              renderer.remove_actor (tile);
+              cleanup_tiles.append (tile);
+              if (cleanup_operation == 0)
+                cleanup_operation = Timeout.add (200, cleanup_operation_callback);
+
               add_to_n_results (-1);
               break;
             }

=== modified file 'unity-private/places/places-default-renderer-tiles.vala'
--- unity-private/places/places-default-renderer-tiles.vala	2010-09-03 00:06:44 +0000
+++ unity-private/places/places-default-renderer-tiles.vala	2010-09-03 00:06:44 +0000
@@ -27,17 +27,22 @@
 
     static const string DEFAULT_ICON = "text-x-preview";
 
-    public unowned Dee.ModelIter iter { get; construct; }
+    public unowned Dee.ModelIter iter { get; construct set; }
 
-    public string  display_name { get; construct; }
-    public string? icon_hint    { get; construct; }
-    public string  uri          { get; construct; }
-    public string? mimetype     { get; construct; }
-    public string? comment      { get; construct; }
+    public string  display_name { get; construct set; }
+    public string? icon_hint    { get; construct set; }
+    public string  uri          { get; construct set; }
+    public string? mimetype     { get; construct set; }
+    public string? comment      { get; construct set; }
 
     public signal void activated (string uri, string mimetype);
 
     public abstract void about_to_show ();
+    public abstract void update_details (string        uri,
+                                         string?       icon_hint,
+                                         string?       mimetype,
+                                         string        display_name,
+                                         string?       comment);
   }
 
   public class FileInfoTile : Tile
@@ -92,6 +97,24 @@
       nwidth = 210.0f;
     }
 
+    public override void update_details (string        uri,
+                                         string?       icon_hint,
+                                         string?       mimetype,
+                                         string        display_name,
+                                         string?       comment)
+    {
+      this.display_name = display_name;
+      this.icon_hint = icon_hint;
+      this.uri = uri;
+      this.mimetype = mimetype;
+      this.comment = comment;
+
+      if (shown == false)
+        return;
+
+      update_details_real ();
+    }
+
     public override void about_to_show ()
     {
       if (shown)
@@ -141,40 +164,42 @@
           }
       });
 
-      Timeout.add (0, () => {
-
-        leaf.text = display_name;
-
-        /* Set the parent directory */
-        var file = File.new_for_uri (uri);
-        if (file is File)
-          {
-            var parent = file.get_parent ();
-            if (parent is File) 
-              {
-                folder.text = parent.get_basename ();
-                folder_button.clicked.connect (() => {
-                  try {
-                    activated (parent.get_uri (), "inode/directory");
-
-                  } catch (Error e) {
-                    warning (@"Unable to launch parent folder: $(e.message)");
-                  }
-                });
-              }
-            else
-              folder.text = "";
-          }
-        else
-          folder.text = "";
-
-        set_icon ();
-        return false;
-      });
-
+      Timeout.add (0, update_details_real);
       queue_relayout ();
     }
 
+    private bool update_details_real ()
+    {
+      leaf.text = display_name;
+
+      /* Set the parent directory */
+      var file = File.new_for_uri (uri);
+      if (file is File)
+        {
+          var parent = file.get_parent ();
+          if (parent is File) 
+            {
+              folder.text = parent.get_basename ();
+              folder_button.clicked.connect (() => {
+                try {
+                  activated (parent.get_uri (), "inode/directory");
+
+                } catch (Error e) {
+                  warning (@"Unable to launch parent folder: $(e.message)");
+                }
+              });
+            }
+          else
+            folder.text = "";
+        }
+      else
+        folder.text = "";
+
+      set_icon ();
+      
+      return false;
+    }
+
     private override void clicked ()
     {
       activated (uri, mimetype);
@@ -371,6 +396,25 @@
       });
     }
 
+    public override void update_details (string        uri,
+                                         string?       icon_hint,
+                                         string?       mimetype,
+                                         string        display_name,
+                                         string?       comment)
+    {
+      this.display_name = display_name;
+      this.icon_hint = icon_hint;
+      this.uri = uri;
+      this.mimetype = mimetype;
+      this.comment = comment;
+
+      if (shown == false)
+        return;
+
+      set_label (display_name);
+      set_icon ();
+    }
+
     private override void get_preferred_width (float for_height,
                                                out float mwidth,
                                                out float nwidth)
@@ -456,7 +500,24 @@
       });
     }
 
-    private override void get_preferred_width (float for_height,
+    public override void update_details (string        uri,
+                                         string?       icon_hint,
+                                         string?       mimetype,
+                                         string        display_name,
+                                         string?       comment)
+    {
+      this.display_name = display_name;
+      this.icon_hint = icon_hint;
+      this.uri = uri;
+      this.mimetype = mimetype;
+      this.comment = comment;
+
+      if (shown == false)
+        return;
+
+      set_label (display_name);
+      set_icon ();
+    }    private override void get_preferred_width (float for_height,
                                                out float mwidth,
                                                out float nwidth)
     {