On Mon, 12 Nov 2012, BALATON Zoltan escribió:
> On Mon, 12 Nov 2012, Carlos R. Mafra wrote:
> >Please do test the #next branch and report any problems (if any).
> >There has been a lot of code churn related to icons. Even though they
> >look relative safe, regressions might be hiding somewhere.
>
> I'm not sure if the "Ignore client supplied icon" option in the Icon
> and Initial Workspace inspector is still working. At least Xfig now
> has the icon I set in the app icon but displays its own icon in the
> miniwindow (which is obscuring the tile completely).
Can you try this:
kix@osaka:~/src/wmaker/wmaker-crm/src$ git diff
diff --git a/src/icon.c b/src/icon.c
index ba059ad..39e4b48 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -359,10 +359,15 @@ RImage *wIconValidateIconSize(RImage *icon, int max_size)
return NULL;
/* We should hold "ICON_BORDER" (~2) pixels to include the icon border
*/
- if ((icon->width - max_size) > -ICON_BORDER ||
- (icon->height - max_size) > -ICON_BORDER) {
- nimage = RScaleImage(icon, max_size - ICON_BORDER,
- (icon->height * (max_size - ICON_BORDER) /
icon->width));
+ if (((max_size - ICON_BORDER) < icon->width) ||
+ ((max_size - ICON_BORDER) < icon->height)) {
+ if (icon->width > icon->height)
+ nimage = RScaleImage(icon, max_size - ICON_BORDER,
+ (icon->height * (max_size -
ICON_BORDER) / icon->width));
+ else
+ nimage = RScaleImage(icon, icon->width * (max_size -
ICON_BORDER) / icon->height,
+ max_size - ICON_BORDER);
+
RReleaseImage(icon);
icon = nimage;
}
Thanks,
kix
> Related to this, if the client supplied icon is too big (like for
> gtk-demo for example) it is simply clipped and not resized. An
> improvement though that it now seems to be centered at least. Could
> the icon be resized (maybe before being cached) to improve this.
>
> Some other things in Wprefs.app which have been there before but I found
> them now:
>
> In Menu Preferences the "Note: this is annoying" text appears clipped
> which is well... annoying. Could this line be removed and just let the
> users decide what they prefer? (I could make a patch if you want, it's
> localised in one file and some translations.)
>
> Also in Expert User Preferences there are two options:
> "Bounce Appicons when the application wants attention."
> and then a few lines further
> "Do not make Appicons bounce."
> This is confusing and I'm not even sure what these mean and why we have
> two seemingly overlapping options without looking up the code.
>
> Other than these minor things it seems to work well so far and has some
> nice improvements like the fix for the few pixel offset of maximised
> windows due to borders. Thanks for the great work on Window Maker.
>
> Regards,
> BALATON Zoltan
>
>
> --
> To unsubscribe, send mail to [email protected].
--
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/
--
To unsubscribe, send mail to [email protected].
