Merge lp:~meese/slingshot/fix-quicklisticons into lp:~elementary-pantheon/slingshot/trunk

[meese]

fix quicklist icons showing up when they are not supposed to

[Cody Garver (codygarver)]

Is it possible/clean/easy to avoid the left margin reserved for icons in quicklists that have no icons at all?

[meese (meese)]

Not a quick fix but I'll do it tomorrow night.

[lp:~meese/slingshot/fix-quicklisticons]

458. By meese on 2014-10-18

fix spacing when no image is present

[Danielle Foré (danrabbit)]

Seems to work as expected

review: Approve (ux)

=== modified file 'src/Backend/App.vala'
--- src/Backend/App.vala	2014-10-17 01:18:02 +0000
+++ src/Backend/App.vala	2014-10-18 01:58:33 +0000
@@ -49,7 +49,6 @@
     public Synapse.Match? target { get; private set; default = null; }
     public Gee.ArrayList<string> actions { get; private set; default = null; }
     public Gee.HashMap<string, string> actions_map { get; private set; default = null; }
-    public Gdk.Pixbuf? quicklist_icon { get; private set; default = null; }
     
     public signal void icon_changed ();
     public signal void launched (App app);
@@ -295,10 +294,10 @@
         return true;
     }
 
+    // Quicklist code from Plank
     public void init_actions () throws KeyFileError  {
         actions = new Gee.ArrayList<string> ();
         actions_map = new Gee.HashMap<string, string> ();
-        quicklist_icon = load_icon (16);
 
         // get FDO Desktop Actions
         // see http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#extra-actions

=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala	2014-10-17 01:18:02 +0000
+++ src/Widgets/AppEntry.vala	2014-10-18 01:58:33 +0000
@@ -38,7 +38,7 @@
         this.view = view;
         Gtk.TargetEntry dnd = {"text/uri-list", 0, 0};
         Gtk.drag_source_set (this, Gdk.ModifierType.BUTTON1_MASK, {dnd},
-            Gdk.DragAction.COPY);
+                             Gdk.DragAction.COPY);
 
         desktop_id = app.desktop_id;
         desktop_path = app.desktop_path;
@@ -133,8 +133,19 @@
         var menu = new PopoverMenu ();
         foreach (var action in application.actions) {
             var values = application.actions_map.get (action).split (";;");
-            var menuitem = new Widgets.PopoverMenuItem (action, application.quicklist_icon);
+            Gdk.Pixbuf? icon = null;
+            var flags = Gtk.IconLookupFlags.FORCE_SIZE;
+
+            try {
+                if (values.length > 1 && values[1] != "" && values[1] != null)
+                    icon = Slingshot.icon_theme.load_icon (values[1], 16, flags);
+            } catch (Error e) {
+                error ("Error loading quicklist icon");
+            }
+
+            var menuitem = new Widgets.PopoverMenuItem (action, icon);
             menu.add_menu_item (menuitem);
+
             menuitem.activated.connect (() => {
                 try {
                     AppInfo.create_from_commandline (values[0], null, AppInfoCreateFlags.NONE).launch (null, null);

=== modified file 'src/Widgets/PopoverMenu.vala'
--- src/Widgets/PopoverMenu.vala	2014-10-17 01:18:02 +0000
+++ src/Widgets/PopoverMenu.vala	2014-10-18 01:58:33 +0000
@@ -39,11 +39,30 @@
     public int get_size () {
         return items.size;
     }
+
+    public override void show () {
+        base.show ();
+        bool has_image = false;
+        foreach (PopoverMenuItem item in items) {
+            if (item.image != null)
+                has_image = true;
+        }
+
+        if (!has_image) {
+            foreach (PopoverMenuItem item in items) {
+                item.label_widget.margin_left = item.label_widget.margin_right = 8;
+                item.space_box.hide ();
+            }
+        }
+    }
 }
 
 public class PopoverMenuItem : Object {
     public Gtk.Widget child = null;
     public signal void activated ();
+    public Gtk.Image? image;
+    public Gtk.Box? space_box;
+    public Gtk.Label label_widget;
 
     public PopoverMenuItem (string label, Gdk.Pixbuf? icon) {
         var button = new Gtk.Button ();
@@ -51,18 +70,18 @@
 
         var grid = new Gtk.Grid ();
         if (icon != null) {
-            var image = new Gtk.Image.from_pixbuf (icon);
+            image = new Gtk.Image.from_pixbuf (icon);
             image.margin_left = 2;
-            image.margin_right = 2;
             image.halign = Gtk.Align.START;
             grid.attach (image, 0, 0, 1, 1);
         } else {
-            var space_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
-            space_box.set_size_request (16, 16);
+            space_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
+            space_box.set_size_request (24, 16);
             grid.attach (space_box, 0, 0, 1, 1);
         }
 
-        var label_widget = new Gtk.Label.with_mnemonic (label);
+        label_widget = new Gtk.Label.with_mnemonic (label);
+        label_widget.margin_left = 2;
         label_widget.margin_right = 16;
         label_widget.justify = Gtk.Justification.LEFT;
         label_widget.set_alignment (0, 0);