Merge lp:~vikoadi/pantheon-files/fix-1087641 into lp:~elementary-apps/pantheon-files/trunk

[Viko Adi Rahmawan]

don't set shadows for small and transparent images

the current problem is the mask that is intended to be an opaque layer of transparent is happen to be transparent too so the shadow behind rectangle is visible.
my branch will just fill the rectangle with full opaque white. its the same implementation as windows 8 did. i think its better than having to use gtk style background color (we cant see picture that intended for white background if our gtk style background is black). Or do we still need to use gtk style background?

[lp:~vikoadi/pantheon-files/fix-1087641]

1464. By Viko Adi Rahmawan on 2014-04-04

fill transparent image with an opaque white instead of detecting background color which can turn out to be transparent

[Danielle Foré (danrabbit)]

Hrm. I'm not entirely sure it's really that much better looking as white than it was as just transparent. I played around with adding some padding around the image or changing the background color and I just wasn't happy with it any of those ways. I'm wondering if it'd be better to just remove both the background and the shadow.

Requesting Cassidy James for a second opinion.

[lp:~vikoadi/pantheon-files/fix-1087641]

1465. By Viko Adi Rahmawan on 2014-04-04

dont use shadow for small icon and icon with alpha channel on the side (based on thunar algorithm)

[Viko Adi Rahmawan (vikoadi)]

have update the branch not to use background or shadow on :
-icon smaller than 48px
-icon with transparency

[Danielle Foré (danrabbit)]

Ah yeah this is great. Design approval :)

review: Approve

[David Gomes (davidgomes)]

That looks like some hacky code but it still gets my approval.

review: Approve

[Viko Adi Rahmawan (vikoadi)]

hello,
about the code, i took the shadowing decision right from thunar source
code. and I'd love to know what's hacky about my code and probably clean it
up (not until next week) .
Thanks

On Thursday, April 17, 2014, David Gomes <email address hidden> wrote:

> The proposal to merge lp:~vikoadi/pantheon-files/fix-1087641 into
> lp:pantheon-files has been updated.
>
> Status: Needs review => Approved
>
> For more details, see:
>
> https://code.launchpad.net/~vikoadi/pantheon-files/fix-1087641/+merge/214148
> --
>
> https://code.launchpad.net/~vikoadi/pantheon-files/fix-1087641/+merge/214148
> You are the owner of lp:~vikoadi/pantheon-files/fix-1087641.
>

=== modified file 'src/marlin-icon-renderer.c'
--- src/marlin-icon-renderer.c	2014-03-12 23:46:52 +0000
+++ src/marlin-icon-renderer.c	2014-04-07 03:45:18 +0000
@@ -59,6 +59,9 @@
                                              const GdkRectangle         *background_area,
                                              const GdkRectangle         *cell_area,
                                              GtkCellRendererState        flags);
+static inline gboolean thumbnail_needs_frame   (const GdkPixbuf             *thumbnail,
+                                                gint                        width,
+                                                gint                        height);
 
 
 enum {
@@ -534,18 +537,12 @@
 
     if (priv->file->flags == GOF_FILE_THUMB_STATE_READY
         && gof_file_get_thumbnail_path (priv->file)
-        && gof_file_thumb_can_frame (priv->file))
+        && gof_file_thumb_can_frame (priv->file)
+        && thumbnail_needs_frame (pixbuf, pix_rect.width, pix_rect.height))
     {
         cairo_make_shadow_for_rect (cr, pix_rect.x+4, pix_rect.y+4,
                                     pix_rect.width-4, pix_rect.height-6,
                                     4, 0, 0, 0, 8);
-        /* we need to mask the underlying shadows in case of transparent thumbs */
-        GdkRGBA bg_color;
-        gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &bg_color);
-        gdk_cairo_set_source_rgba (cr, &bg_color);
-        cairo_rectangle (cr, pix_rect.x, pix_rect.y,
-                         pix_rect.width, pix_rect.height);
-        cairo_fill (cr);
     }
 
     gtk_render_icon (context, cr, pixbuf,
@@ -794,5 +791,47 @@
     _cairo_pattern_destroy0 (pat);
 }
 
-
-
+static inline gboolean
+thumbnail_needs_frame (const GdkPixbuf *thumbnail,
+                       gint             width,
+                       gint             height)
+{
+  const guchar *pixels;
+  gint          rowstride;
+  gint          n;
+
+  /* don't add frames to small thumbnails */
+  if (width < 48 && height < 48)
+    return FALSE;
+
+  /* always add a frame to thumbnails w/o alpha channel */
+  if (G_LIKELY (!gdk_pixbuf_get_has_alpha (thumbnail)))
+    return TRUE;
+
+  /* get a pointer to the thumbnail data */
+  pixels = gdk_pixbuf_get_pixels (thumbnail);
+
+  /* check if we have a transparent pixel on the first row */
+  for (n = width * 4; n > 0; n -= 4)
+    if (pixels[n - 1] < 255u)
+      return FALSE;
+  g_debug("transparent pixel");
+
+  /* determine the rowstride */
+  rowstride = gdk_pixbuf_get_rowstride (thumbnail);
+
+  /* skip the first row */
+  pixels += rowstride;
+
+  /* check if we have a transparent pixel in the first or last column */
+  for (n = height - 2; n > 0; --n, pixels += rowstride)
+    if (pixels[3] < 255u || pixels[width * 4 - 1] < 255u)
+      return FALSE;
+
+  /* check if we have a transparent pixel on the last row */
+  for (n = width * 4; n > 0; n -= 4)
+    if (pixels[n - 1] < 255u)
+      return FALSE;
+
+  return TRUE;
+}