[PATCH 07/10] ICON_SIZE defined as wPreferences.icon_size

[Rodolfo García Peñas]

>From 951b775a28e427909edcd4f4986a19905e0dd430 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <k...@kix.es>
Date: Wed, 6 Jun 2012 12:28:21 +0200
Subject: [PATCH 07/10] ICON_SIZE defined as wPreferences.icon_size

This change permits icon sizes different than 64.
---
 src/icon.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/icon.c b/src/icon.c
index 55cd251..576e459 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -49,6 +49,7 @@
 extern WPreferences wPreferences;
 
 #define MOD_MASK wPreferences.modifier_mask
+#define ICON_SIZE wPreferences.icon_size
 #define CACHE_ICON_PATH "/Library/WindowMaker/CachedPixmaps"
 
 extern Cursor wCursor[WCUR_LAST];
@@ -354,9 +355,9 @@ RImage *wIconValidateIconSize(WScreen * scr, RImage * icon, 
int max_size)
        if (!icon)
                return NULL;
 #ifndef DONT_SCALE_ICONS
-       if (max_size != 64) {
-               w = max_size * icon->width / 64;
-               h = max_size * icon->height / 64;
+       if (max_size != ICON_SIZE) {
+               w = max_size * icon->width / ICON_SIZE;
+               h = max_size * icon->height / ICON_SIZE;
 
                tmp = RScaleImage(icon, w, h);
                RReleaseImage(icon);
-- 
1.7.10

-- 
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/

>From 951b775a28e427909edcd4f4986a19905e0dd430 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <k...@kix.es>
Date: Wed, 6 Jun 2012 12:28:21 +0200
Subject: [PATCH 07/10] ICON_SIZE defined as wPreferences.icon_size

This change permits icon sizes different than 64.
---
 src/icon.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/icon.c b/src/icon.c
index 55cd251..576e459 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -49,6 +49,7 @@
 extern WPreferences wPreferences;
 
 #define MOD_MASK wPreferences.modifier_mask
+#define ICON_SIZE wPreferences.icon_size
 #define CACHE_ICON_PATH "/Library/WindowMaker/CachedPixmaps"
 
 extern Cursor wCursor[WCUR_LAST];
@@ -354,9 +355,9 @@ RImage *wIconValidateIconSize(WScreen * scr, RImage * icon, int max_size)
 	if (!icon)
 		return NULL;
 #ifndef DONT_SCALE_ICONS
-	if (max_size != 64) {
-		w = max_size * icon->width / 64;
-		h = max_size * icon->height / 64;
+	if (max_size != ICON_SIZE) {
+		w = max_size * icon->width / ICON_SIZE;
+		h = max_size * icon->height / ICON_SIZE;
 
 		tmp = RScaleImage(icon, w, h);
 		RReleaseImage(icon);
-- 
1.7.10