Merge lp:~voluntatefaber/slingshot/icon-search-view into lp:~elementary-pantheon/slingshot/trunk

[Andrea Basso]

[lp:~voluntatefaber/slingshot/icon-search-view]

284. By Andrea Basso on 2012-10-16

Little improvements in variable naming

Unmerged revisions

284. By Andrea Basso on 2012-10-16

Little improvements in variable naming

283. By Andrea Basso on 2012-10-16

Icons are displayed correctly, even in search view

=== modified file 'src/Backend/App.vala'
--- src/Backend/App.vala	2012-09-16 16:53:01 +0000
+++ src/Backend/App.vala	2012-10-16 16:48:21 +0000
@@ -30,6 +30,8 @@
         public double popularity { get; set; }
         public double relevancy { get; set; }
         public string desktop_path { get; private set; }
+        
+        private unowned GLib.DesktopAppInfo info;
 
         private bool is_command = false;
 
@@ -38,7 +40,7 @@
 
         public App (GMenu.TreeEntry entry) {
 
-            unowned GLib.DesktopAppInfo info = entry.get_app_info ();
+            info = entry.get_app_info ();
             name = info.get_display_name ().dup ();
             description = info.get_description ().dup () ?? name;
             exec = info.get_commandline ().dup ();
@@ -80,35 +82,42 @@
             update_icon ();
 
         }
-
-        public void update_icon () {
-
+        
+        private Gdk.Pixbuf private_get_scaled_icon (int size = Slingshot.settings.icon_size) {
+        
+            Gdk.Pixbuf result;
+            
             try {
-                icon = Slingshot.icon_theme.load_icon (icon_name, Slingshot.settings.icon_size,
-                                                        Gtk.IconLookupFlags.FORCE_SIZE);
+                result = Slingshot.icon_theme.load_icon (icon_name, size, Gtk.IconLookupFlags.FORCE_SIZE);
             } catch (Error e) {
                 try {
                     if (icon_name.last_index_of (".") > 0)
-                        icon = Slingshot.icon_theme.load_icon (icon_name[0:icon_name.last_index_of (".")],
-                                                               Slingshot.settings.icon_size, Gtk.IconLookupFlags.FORCE_SIZE);
+                        result = Slingshot.icon_theme.load_icon (icon_name[0:icon_name.last_index_of (".")],
+                                                               size, Gtk.IconLookupFlags.FORCE_SIZE);
                     else
                         throw new IOError.NOT_FOUND ("Requested image could not be found.");
                         
                 } catch (Error e) {
                     try {
-                        icon = new Gdk.Pixbuf.from_file_at_scale (icon_name, Slingshot.settings.icon_size,
-                                                                  Slingshot.settings.icon_size, false);
+                        result = new Gdk.Pixbuf.from_file_at_scale (icon_name, size, size, false);
                     } catch (Error e) {
                         try {
-                            icon = Slingshot.icon_theme.load_icon ("application-default-icon", Slingshot.settings.icon_size,
+                            result = Slingshot.icon_theme.load_icon ("application-default-icon", size,
                                                                    Gtk.IconLookupFlags.FORCE_SIZE);
                         } catch (Error e) {
-                            icon = Slingshot.icon_theme.load_icon ("gtk-missing-image", Slingshot.settings.icon_size,
+                            result = Slingshot.icon_theme.load_icon ("gtk-missing-image", size, 
                                                                    Gtk.IconLookupFlags.FORCE_SIZE);
                         }
                     }
                 }
             }
+            
+            return result;
+        }
+
+        public void update_icon () {
+
+            icon = private_get_scaled_icon ();
 
             icon_changed ();
 
@@ -130,6 +139,24 @@
             }
 
         }
+        
+        public Gdk.Pixbuf get_scaled_icon (int size) {
+        
+            Gdk.Pixbuf result;
+        
+            if (info.get_icon () is LoadableIcon) {
+                try {
+                    var ios = (info.get_icon () as LoadableIcon).load (0, null, null);
+                    result = new Gdk.Pixbuf.from_stream_at_scale (ios, size, size, true, null);
+                } catch {
+                    result = private_get_scaled_icon (size);
+                }
+            } else {
+                result = private_get_scaled_icon (size);
+            }
+            
+            return result;
+        }
 
     }
 

=== modified file 'src/Widgets/SearchItem.vala'
--- src/Widgets/SearchItem.vala	2012-09-09 18:14:52 +0000
+++ src/Widgets/SearchItem.vala	2012-10-16 16:48:21 +0000
@@ -22,6 +22,8 @@
 namespace Slingshot.Widgets {
 
     public class SearchItem : Button {
+    
+        private Backend.App app;
 
         private Pixbuf icon;
         private string icon_name;
@@ -33,6 +35,8 @@
         public signal void launch_app ();
 
         public SearchItem (Backend.App app) {
+        
+            this.app = app;
 
             get_style_context ().add_class ("app");
 
@@ -65,24 +69,8 @@
             get_allocation (out size);
 
             base.draw (cr);
-
-            Pixbuf scaled_icon = null;
-            try {
-                scaled_icon = Slingshot.icon_theme.load_icon (icon_name, icon_size,
-                                                        Gtk.IconLookupFlags.FORCE_SIZE);
-            } catch (Error e) {
-                try {
-                    scaled_icon = new Gdk.Pixbuf.from_file_at_scale (icon_name, icon_size, icon_size, false);
-                } catch (Error e) {
-	            	try {
-                        scaled_icon = Slingshot.icon_theme.load_icon ("application-default-icon", icon_size,
-                                                               Gtk.IconLookupFlags.FORCE_SIZE);
-	        	    } catch (Error e) {
-                        scaled_icon = Slingshot.icon_theme.load_icon ("gtk-missing-image", icon_size,
-                                                               Gtk.IconLookupFlags.FORCE_SIZE);
-	            	}
-                }
-            }
+            
+            Pixbuf scaled_icon = app.get_scaled_icon (icon_size);
 
             height_request = icon_size + 10;