From: Rodolfo García Peñas (kix) <kix@kix.es>
Date: Wed, 14 Nov 2012 17:36:25 +0000 (+0100)
Subject: get_wwindow_image_from_wmhints scale image
X-Git-Tag: wmaker-0.95.4~38
X-Git-Url: https://repo.or.cz/w/wmaker-crm.git/commitdiff_plain/5956d71d77fcb76273c6eccaab2347276c04fbcd

get_wwindow_image_from_wmhints scale image

The function get_wwindow_image_from_wmhints returns a image from WM Hints,
but the image could be larger than the desired.

Then, the image can be resized using wIconValidateIconSize(). The resize
should be done in get_rimage_icon_from_wm_hints(), not in the function
get_wwindow_image_from_wmhints(). This is because the function
get_wwindow_image_from_wmhints() is used in wIconStore() too. If we resize
the image before save it to disk, then if we change the icon/dock size, then
the image saved will have a different size than the curren icon size. Is
better resize the image when is painted in the screen, not the image saved.
---

diff --git a/src/icon.c b/src/icon.c
index 5a181480..166c8272 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -756,6 +756,9 @@ static int get_rimage_icon_from_wm_hints(WIcon *icon)
 	if (!image)
 		return 1;
 
+	/* Resize the icon to the wPreferences.icon_size size */
+	image = wIconValidateIconSize(image, wPreferences.icon_size);
+
 	unset_icon_image(icon);
 	icon->file_image = image;