Merge lp:~donadigo/slingshot/correct-count-image-margins into lp:~elementary-pantheon/slingshot/trunk

[Adam Bieńkowski]

* Correct count image margins so they don't get cut off

Fixes bug #1602303: "Sometimes bubbles appears cropped"

This branch corrects the margins to be ICON_SIZE - SURFACE_SIZE which in this case will be 16 instead of 18.

[Zisu Andrei (matzipan)]

I can confirm this fixes the issue.

Not merging yet on advice from Cody.

review: Approve

=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala	2016-07-05 20:18:20 +0000
+++ src/Widgets/AppEntry.vala	2016-11-07 14:49:12 +0000
@@ -60,6 +60,8 @@
 #endif
     }
 
+    private const int ICON_SIZE = 64;
+
 #if HAS_PLANK_0_11
     private const int SURFACE_SIZE = 48;
     private static Plank.DockTheme plank_theme = new Plank.DockTheme ("Gtk+");
@@ -97,14 +99,14 @@
 
         image = new Gtk.Image ();
         image.gicon = app.icon;
-        image.pixel_size = 64;
+        image.pixel_size = ICON_SIZE;
         image.margin_top = 12;
 
         count_image = new Gtk.Image ();
         count_image.no_show_all = true;
         count_image.visible = false;
-        count_image.margin_start = 18;
-        count_image.margin_bottom = 12;
+        count_image.margin_start = ICON_SIZE - SURFACE_SIZE;
+        count_image.margin_bottom = ICON_SIZE - SURFACE_SIZE;
 
         var overlay = new Gtk.Overlay ();
         overlay.add (image);