[Xfce4-commits] [xfce/thunar] 36/46: Fix missing icons and file-emblems in compact and detailed list view

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

a   n   d   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/thunar.

commit d83ecd7a8cc60a95ad6937d1ff36d616116a349b
Author: acs <acs82 at gmx.de>
Date:   Fri May 12 22:19:44 2017 +0200

    Fix missing icons and file-emblems in compact and detailed list view
---
 thunar/thunar-icon-renderer.c           | 7 ++-----
 thunar/thunar-shortcuts-icon-renderer.c | 4 +---
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/thunar/thunar-icon-renderer.c b/thunar/thunar-icon-renderer.c
index fea809e..1561dc7 100644
--- a/thunar/thunar-icon-renderer.c
+++ b/thunar/thunar-icon-renderer.c
@@ -357,7 +357,6 @@ thunar_icon_renderer_render (GtkCellRenderer     *renderer,
   GtkIconTheme           *icon_theme;
   GdkRectangle            emblem_area;
   GdkRectangle            icon_area;
-  GdkRectangle            draw_area;
   GdkRectangle            clip_area;
   GdkPixbuf              *emblem;
   GdkPixbuf              *icon;
@@ -426,7 +425,7 @@ thunar_icon_renderer_render (GtkCellRenderer     *renderer,
   color_lighten = (flags & GTK_CELL_RENDERER_PRELIT) != 0 && icon_renderer->follow_state;
 
   /* check whether the icon is affected by the expose event */
-  if (gdk_rectangle_intersect (&clip_area, &icon_area, &draw_area))
+  if (gdk_rectangle_intersect (&clip_area, &icon_area, NULL))
     {
       /* use a translucent icon to represent cutted and hidden files to the user */
       clipboard = thunar_clipboard_manager_get_for_display (gtk_widget_get_display (widget));
@@ -467,7 +466,6 @@ thunar_icon_renderer_render (GtkCellRenderer     *renderer,
 
       /* render the invalid parts of the icon */
       thunar_gdk_cairo_set_source_pixbuf (cr, icon, icon_area.x, icon_area.y);
-      gdk_cairo_rectangle (cr, &draw_area);
       cairo_paint_with_alpha (cr, alpha);
 
       /* paint the lighten mask */
@@ -556,11 +554,10 @@ thunar_icon_renderer_render (GtkCellRenderer     *renderer,
                 }
 
               /* render the emblem */
-              if (gdk_rectangle_intersect (&clip_area, &emblem_area, &draw_area))
+              if (gdk_rectangle_intersect (&clip_area, &emblem_area, NULL))
                 {
                   /* render the invalid parts of the icon */
                   thunar_gdk_cairo_set_source_pixbuf (cr, emblem, emblem_area.x, emblem_area.y);
-                  gdk_cairo_rectangle (cr, &draw_area);
                   cairo_paint (cr);
 
                   /* paint the lighten mask */
diff --git a/thunar/thunar-shortcuts-icon-renderer.c b/thunar/thunar-shortcuts-icon-renderer.c
index 898e79e..3816ffa 100644
--- a/thunar/thunar-shortcuts-icon-renderer.c
+++ b/thunar/thunar-shortcuts-icon-renderer.c
@@ -212,7 +212,6 @@ thunar_shortcuts_icon_renderer_render (GtkCellRenderer     *renderer,
 {
   ThunarShortcutsIconRenderer *shortcuts_icon_renderer = THUNAR_SHORTCUTS_ICON_RENDERER (renderer);
   GtkIconTheme                *icon_theme;
-  GdkRectangle                 draw_area;
   GdkRectangle                 icon_area;
   GdkRectangle                 clip_area;
   GtkIconInfo                 *icon_info;
@@ -279,11 +278,10 @@ thunar_shortcuts_icon_renderer_render (GtkCellRenderer     *renderer,
           icon_area.y = cell_area->y + (cell_area->height - icon_area.height) / 2;
 
           /* check whether the icon is affected by the expose event */
-          if (gdk_rectangle_intersect (&clip_area, &icon_area, &draw_area))
+          if (gdk_rectangle_intersect (&clip_area, &icon_area, NULL))
             {
               /* render the invalid parts of the icon */
               thunar_gdk_cairo_set_source_pixbuf (cr, icon, icon_area.x, icon_area.y);
-              gdk_cairo_rectangle (cr, &draw_area);
               cairo_paint_with_alpha (cr, alpha);
             }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.