[Xfce4-commits] <thunar:master> Use 32 instead of 36 pixels for small icons.

[Jannis Pohlmann]

Updating branch refs/heads/master
         to 2147190c02c2ece7a924752a8d63bcf45e5568af (commit)
       from 1863f2c8e08c774f4273d424d00863a36fae5ad6 (commit)

commit 2147190c02c2ece7a924752a8d63bcf45e5568af
Author: Jannis Pohlmann <jannis.pohlmann at codethink.co.uk>
Date:   Sat Feb 4 11:56:23 2012 +0000

    Use 32 instead of 36 pixels for small icons.
    
    It feels like a more sensible choice as 36px is not among the common
    icon sizes such as 16, 24, 32, 48 etc., meaning that all icons loaded
    from icon themes need to be rescaled when using 36px.

 thunar/thunar-enum-types.h    |    2 +-
 thunar/thunar-icon-factory.c  |    2 +-
 thunar/thunar-icon-renderer.c |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/thunar/thunar-enum-types.h b/thunar/thunar-enum-types.h
index c5f78ba..8b4db52 100644
--- a/thunar/thunar-enum-types.h
+++ b/thunar/thunar-enum-types.h
@@ -151,7 +151,7 @@ typedef enum
 {
   THUNAR_ICON_SIZE_SMALLEST = 16,
   THUNAR_ICON_SIZE_SMALLER  = 24,
-  THUNAR_ICON_SIZE_SMALL    = 36,
+  THUNAR_ICON_SIZE_SMALL    = 32,
   THUNAR_ICON_SIZE_NORMAL   = 48,
   THUNAR_ICON_SIZE_LARGE    = 64,
   THUNAR_ICON_SIZE_LARGER   = 96,
diff --git a/thunar/thunar-icon-factory.c b/thunar/thunar-icon-factory.c
index 4f2ec42..2159720 100644
--- a/thunar/thunar-icon-factory.c
+++ b/thunar/thunar-icon-factory.c
@@ -441,7 +441,7 @@ thunar_icon_factory_load_from_file (ThunarIconFactory *factory,
        * want to do this for icons displayed in the details view).
        */
       needs_frame = (strstr (path, G_DIR_SEPARATOR_S ".thumbnails" G_DIR_SEPARATOR_S) != NULL)
-                 && (size >= 36) && thumbnail_needs_frame (pixbuf, width, height);
+                 && (size >= 32) && thumbnail_needs_frame (pixbuf, width, height);
 
       /* be sure to make framed thumbnails fit into the size */
       if (G_LIKELY (needs_frame))
diff --git a/thunar/thunar-icon-renderer.c b/thunar/thunar-icon-renderer.c
index d3fed33..4356499 100644
--- a/thunar/thunar-icon-renderer.c
+++ b/thunar/thunar-icon-renderer.c
@@ -470,10 +470,10 @@ thunar_icon_renderer_render (GtkCellRenderer     *renderer,
               emblem_area.height = gdk_pixbuf_get_height (emblem);
 
               /* shrink insane emblems */
-              if (G_UNLIKELY (MAX (emblem_area.width, emblem_area.height) > (gint) MIN ((2 * icon_renderer->size) / 3, 36)))
+              if (G_UNLIKELY (MAX (emblem_area.width, emblem_area.height) > (gint) MIN ((2 * icon_renderer->size) / 3, 32)))
                 {
                   /* scale down the emblem */
-                  temp = exo_gdk_pixbuf_scale_ratio (emblem, MIN ((2 * icon_renderer->size) / 3, 36));
+                  temp = exo_gdk_pixbuf_scale_ratio (emblem, MIN ((2 * icon_renderer->size) / 3, 32));
                   g_object_unref (G_OBJECT (emblem));
                   emblem = temp;