diff --git a/WINGs/ChangeLog b/WINGs/ChangeLog index f541457b..a64bcc00 100644 --- a/WINGs/ChangeLog +++ b/WINGs/ChangeLog @@ -38,8 +38,8 @@ Changes since wmaker 0.64.0: room for the new functions added for operating on images with alpha info. 2. Added WMSetApplicationIconImage() and WMGetApplicationIconImage() which operate on an RImage and store alpha information too. - 3. Added WMGetApplicationIconBlendedPixmap() which will take the image with - alpha set by WMSetApplicationIconImage() and will blend it with a color. + 3. Added WMCreateApplicationIconBlendedPixmap() which will take the image + set by WMSetApplicationIconImage() and will combine it with a color. If color is NULL it will blend using the default panel color (#aeaaae) All these changes will allow WINGs to handle images with alpha blending correctly in panels and wherever else needed. More about in NEWS. diff --git a/WINGs/NEWS b/WINGs/NEWS index a2f54293..fc02bafe 100644 --- a/WINGs/NEWS +++ b/WINGs/NEWS @@ -15,7 +15,7 @@ changes took place: 2. The following functions were added: - WMSetApplicationIconImage(WMScreen *scr, RImage *image) - RImage* WMGetApplicationIconImage(WMScreen *scr) - - WMPixmap* WMGetApplicationIconBlendedPixmap(WMScreen *scr, RColor *color) + - WMPixmap* WMCreateApplicationIconBlendedPixmap(WMScreen *scr, RColor *col) As you can see the old functions that operated on WMPixmap images (which are basically X Pixmaps that lack alpha information) were renamed to ...Pixmap() @@ -54,7 +54,7 @@ different icon to be shown in the appicon than in panels. Also this new function was added: -- WMGetApplicationIconBlendedPixmap() will use the RImage set with +- WMCreateApplicationIconBlendedPixmap() will use the RImage set with WMSetApplicationIconImage() if available and will blend it with the color you passed. This will make the image show well on a background of that color. If the RImage was not set it will return NULL. You need to call diff --git a/WINGs/WINGs/WINGs.h b/WINGs/WINGs/WINGs.h index 64d337de..df227406 100644 --- a/WINGs/WINGs/WINGs.h +++ b/WINGs/WINGs/WINGs.h @@ -633,7 +633,7 @@ void WMSetApplicationIconPixmap(WMScreen *app, WMPixmap *icon); WMPixmap* WMGetApplicationIconPixmap(WMScreen *app); /* If color==NULL it will use the default color for panels: ae/aa/ae */ -WMPixmap* WMGetApplicationIconBlendedPixmap(WMScreen *scr, RColor *color); +WMPixmap* WMCreateApplicationIconBlendedPixmap(WMScreen *scr, RColor *color); void WMSetApplicationIconWindow(WMScreen *scr, Window window); diff --git a/WINGs/wappresource.c b/WINGs/wappresource.c index b8f15268..49ac2108 100644 --- a/WINGs/wappresource.c +++ b/WINGs/wappresource.c @@ -104,7 +104,7 @@ WMGetApplicationIconPixmap(WMScreen *scr) WMPixmap* -WMGetApplicationIconBlendedPixmap(WMScreen *scr, RColor *color) +WMCreateApplicationIconBlendedPixmap(WMScreen *scr, RColor *color) { WMPixmap *pix; diff --git a/WINGs/wfilepanel.c b/WINGs/wfilepanel.c index 1bde060a..bd0a790b 100644 --- a/WINGs/wfilepanel.c +++ b/WINGs/wfilepanel.c @@ -198,7 +198,7 @@ makeFilePanel(WMScreen *scrPtr, char *name, char *title) WMResizeWidget(fPtr->iconLabel, 64, 64); WMMoveWidget(fPtr->iconLabel, 0, 0); WMSetLabelImagePosition(fPtr->iconLabel, WIPImageOnly); - icon = WMGetApplicationIconBlendedPixmap(scrPtr, (RColor*)NULL); + icon = WMCreateApplicationIconBlendedPixmap(scrPtr, (RColor*)NULL); if (icon) { WMSetLabelImage(fPtr->iconLabel, icon); WMReleasePixmap(icon); diff --git a/WINGs/wpanel.c b/WINGs/wpanel.c index 2938c383..05ff748d 100644 --- a/WINGs/wpanel.c +++ b/WINGs/wpanel.c @@ -138,7 +138,7 @@ WMCreateAlertPanel(WMScreen *scrPtr, WMWindow *owner, WMSetLabelImagePosition(panel->iLbl, WIPImageOnly); WMMapWidget(panel->iLbl); WMAddBoxSubview(hbox, WMWidgetView(panel->iLbl), False, True, 64, 0, 10); - icon = WMGetApplicationIconBlendedPixmap(scrPtr, (RColor*)NULL); + icon = WMCreateApplicationIconBlendedPixmap(scrPtr, (RColor*)NULL); if (icon) { WMSetLabelImage(panel->iLbl, icon); WMReleasePixmap(icon); @@ -560,7 +560,7 @@ WMCreateGenericPanel(WMScreen *scrPtr, WMWindow *owner, WMSetLabelImagePosition(panel->iLbl, WIPImageOnly); WMMapWidget(panel->iLbl); WMAddBoxSubview(hbox, WMWidgetView(panel->iLbl), False, True, 64, 0, 10); - icon = WMGetApplicationIconBlendedPixmap(scrPtr, (RColor*)NULL); + icon = WMCreateApplicationIconBlendedPixmap(scrPtr, (RColor*)NULL); if (icon) { WMSetLabelImage(panel->iLbl, icon); WMReleasePixmap(icon); diff --git a/src/dialog.c b/src/dialog.c index 2bf425ae..43e67944 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -1202,7 +1202,7 @@ wShowInfoPanel(WScreen *scr) panel->win = WMCreateWindow(scr->wmscreen, "info"); WMResizeWidget(panel->win, 382, 230); - logo = WMGetApplicationIconBlendedPixmap(scr->wmscreen, (RColor*)NULL); + logo = WMCreateApplicationIconBlendedPixmap(scr->wmscreen, (RColor*)NULL); if (!logo) { logo = WMRetainPixmap(WMGetApplicationIconPixmap(scr->wmscreen)); }