[Xfce4-commits] r23612 - in thunar/trunk: . thunar

[Benedikt Meurer]

Author: benny
Date: 2006-11-03 16:28:03 +0000 (Fri, 03 Nov 2006)
New Revision: 23612

Modified:
   thunar/trunk/ChangeLog
   thunar/trunk/thunar/thunar-icon-renderer.c
Log:
2006-11-03	Benedikt Meurer <benny at xfce.org>

	* thunar/thunar-icon-renderer.c(thunar_icon_renderer_render): Make sure
	  emblems don't get too large with SVG icon themes. Bug #2466.




Modified: thunar/trunk/ChangeLog
===================================================================
--- thunar/trunk/ChangeLog	2006-11-03 16:23:04 UTC (rev 23611)
+++ thunar/trunk/ChangeLog	2006-11-03 16:28:03 UTC (rev 23612)
@@ -1,5 +1,10 @@
 2006-11-03	Benedikt Meurer <benny at xfce.org>
 
+	* thunar/thunar-icon-renderer.c(thunar_icon_renderer_render): Make sure
+	  emblems don't get too large with SVG icon themes. Bug #2466.
+
+2006-11-03	Benedikt Meurer <benny at xfce.org>
+
 	* thunar/thunar-trash-action.{c,h}, thunar/Makefile.am,
 	  thunar/thunar-stock.{c,h}, thunar/thunar-window-ui.xml,
 	  thunar/thunar-window.c: Add a "Trash" entry to the "Go" menu.

Modified: thunar/trunk/thunar/thunar-icon-renderer.c
===================================================================
--- thunar/trunk/thunar/thunar-icon-renderer.c	2006-11-03 16:23:04 UTC (rev 23611)
+++ thunar/trunk/thunar/thunar-icon-renderer.c	2006-11-03 16:28:03 UTC (rev 23612)
@@ -504,10 +504,10 @@
               emblem_area.height = gdk_pixbuf_get_height (emblem);
 
               /* shrink insane emblems */
-              if (G_UNLIKELY (MAX (emblem_area.width, emblem_area.height) > (2 * icon_renderer->size) / 3))
+              if (G_UNLIKELY (MAX (emblem_area.width, emblem_area.height) > MIN ((2 * icon_renderer->size) / 3, 36)))
                 {
                   /* scale down the emblem */
-                  temp = exo_gdk_pixbuf_scale_ratio (emblem, (2 * icon_renderer->size) / 3);
+                  temp = exo_gdk_pixbuf_scale_ratio (emblem, MIN ((2 * icon_renderer->size) / 3, 36));
                   g_object_unref (G_OBJECT (emblem));
                   emblem = temp;