Merge lp:~voldyman/slingshot/fix-install-exp into lp:~elementary-pantheon/slingshot/trunk

[Akshay Shekher]

Fixes buggy rendering of app icons right after installing them.

This branch fixes the buggy rendering of the app icons when installing

[David Gomes (davidgomes)]

review: Approve

=== modified file 'AUTHORS'
--- AUTHORS	2012-06-20 22:40:16 +0000
+++ AUTHORS	2014-07-07 17:05:07 +0000
@@ -4,3 +4,4 @@
  * Giulio Collura <[e-mail]>
  * Maxwell Barvian
  * Andrea Basso <[e-mail]>
+ * Akshay Shekher <[e-mail]>

=== modified file 'src/Backend/App.vala'
--- src/Backend/App.vala	2014-06-12 09:36:00 +0000
+++ src/Backend/App.vala	2014-07-07 17:05:07 +0000
@@ -1,6 +1,7 @@
 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
 //
 //  Copyright (C) 2011-2012 Giulio Collura
+//                2013-2014 Akshay Shekher
 //
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -50,6 +51,12 @@
     public signal void icon_changed ();
     public signal void launched (App app);
 
+    // seconds to wait before retrying icon check
+    private const int RECHECK_TIMEOUT = 2;
+    private bool check_icon_again = true;
+
+    private LoadableIcon loadable_icon = null;
+
     public App (GMenu.TreeEntry entry) {
         app_type = AppType.APP;
 
@@ -68,21 +75,16 @@
         if (info.get_icon () is ThemedIcon) {
             icon_name = (info.get_icon () as ThemedIcon).get_names ()[0].dup ();
         } else if (info.get_icon () is LoadableIcon) {
-            try {
-                var ios = (info.get_icon () as LoadableIcon).load (0, null, null);
-                icon = new Gdk.Pixbuf.from_stream_at_scale (ios, Slingshot.settings.icon_size,
-                    Slingshot.settings.icon_size, true, null);
-            } catch {
-                icon_name = "application-default-icon";
-            }
+            loadable_icon = info.get_icon () as LoadableIcon;
+            icon = get_loadable_icon ();
         } else {
             icon_name = "application-default-icon";
         }
-
-        if (icon == null)
+        if (icon == null) {
             update_icon ();
 
-        Slingshot.icon_theme.changed.connect (update_icon);
+            Slingshot.icon_theme.changed.connect (update_icon);
+        }
     }
 
     public App.from_command (string command) {
@@ -113,8 +115,13 @@
 
     }
 
+    ~App () {
+        Slingshot.icon_theme.changed.disconnect (update_icon);
+    }
+
     public void update_icon () {
         icon = load_icon (Slingshot.settings.icon_size);
+
         icon_changed ();
     }
 
@@ -156,6 +163,9 @@
         Gdk.Pixbuf icon = null;
         var flags = Gtk.IconLookupFlags.FORCE_SIZE;
 
+        if (loadable_icon != null)
+            return get_loadable_icon ();
+
         IconLoadFallbackMethod[] fallbacks = {
             new IconLoadFallbackMethod (() => {
                 try {
@@ -166,6 +176,20 @@
             }),
 
             new IconLoadFallbackMethod (() => {
+                // Since the best method didn't work retry after some time
+                if (check_icon_again) {
+                    // only recheck once
+                    check_icon_again = false;
+
+                    Timeout.add_seconds (RECHECK_TIMEOUT, () => {
+                        Slingshot.icon_theme.rescan_if_needed ();
+                        update_icon ();
+                        return false;
+                    });
+                }
+            }),
+
+            new IconLoadFallbackMethod (() => {
                 try {
                     if (icon_name.last_index_of (".") > 0) {
                         var name = icon_name[0:icon_name.last_index_of (".")];
@@ -200,7 +224,6 @@
                  }
             })
         };
-
         foreach (IconLoadFallbackMethod fallback in fallbacks) {
             fallback.load_icon ();
             if (icon != null)
@@ -210,6 +233,18 @@
         return icon;
     }
 
+    public Gdk.Pixbuf? get_loadable_icon () {
+        Gdk.Pixbuf? tmp_loadable_icon;
+        try {
+            var icon_stream = loadable_icon.load (0, null, null);
+            tmp_loadable_icon = new Gdk.Pixbuf.from_stream_at_scale (icon_stream, Slingshot.settings.icon_size,
+                                                                     Slingshot.settings.icon_size, true, null);
+        } catch (Error e) {
+            tmp_loadable_icon = null;
+        }
+        return tmp_loadable_icon;
+    }
+
     public bool launch () {
         try {
             switch (app_type) {

=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2014-06-12 09:14:57 +0000
+++ src/SlingshotView.vala	2014-07-07 17:05:07 +0000
@@ -812,8 +812,8 @@
                 app_entry.show_all ();
             }
 
+
             stack.set_visible_child_name ("normal");
-
         }
 
         private void read_settings (bool first_start = false, bool check_columns = true, bool check_rows = true) {

=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala	2014-02-24 20:43:38 +0000
+++ src/Widgets/AppEntry.vala	2014-07-07 17:05:07 +0000
@@ -84,7 +84,10 @@
             sel.set_uris ({File.new_for_path (desktop_path).get_uri ()});
         });
 
-        app.icon_changed.connect (queue_draw);
+        app.icon_changed.connect (() => {
+            icon = app.icon;
+            queue_draw ();
+        });
 
     }
 

=== modified file 'src/Widgets/Switcher.vala'
--- src/Widgets/Switcher.vala	2014-02-24 20:43:38 +0000
+++ src/Widgets/Switcher.vala	2014-07-07 17:05:07 +0000
@@ -66,6 +66,9 @@
         buttons.set (widget, button);
         if (buttons.size == 1)
             button.active = true;
+
+        // show all children after update
+        show_all ();
     }
     
     public override void show () {