mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-19 20:38:08 +01:00
Fixed the info panel to work well with icons different in size than the
default GNUstep.xpm
This commit is contained in:
@@ -917,7 +917,7 @@ XChangeKeyboardControl(dpy,KBBellPitch|KBBellDuration|KBBellPercent,&kc);
|
|||||||
RImage *image;
|
RImage *image;
|
||||||
WMPixmap *pix;
|
WMPixmap *pix;
|
||||||
|
|
||||||
image = RCloneImage(panel->icon);
|
image = RScaleImage(panel->icon, panel->pic->width, panel->pic->height);
|
||||||
RCombineImagesWithOpaqueness(image, panel->pic, panel->cycle*255/30);
|
RCombineImagesWithOpaqueness(image, panel->pic, panel->cycle*255/30);
|
||||||
pix = WMCreatePixmapFromRImage(panel->scr->wmscreen, image, 128);
|
pix = WMCreatePixmapFromRImage(panel->scr->wmscreen, image, 128);
|
||||||
RDestroyImage(image);
|
RDestroyImage(image);
|
||||||
@@ -1107,8 +1107,7 @@ handleLogoPush(XEvent *event, void *data)
|
|||||||
}
|
}
|
||||||
if (!panel->pic) {
|
if (!panel->pic) {
|
||||||
panel->pic = RGetImageFromXPMData(panel->scr->rcontext, pic_data);
|
panel->pic = RGetImageFromXPMData(panel->scr->rcontext, pic_data);
|
||||||
if (!panel->pic || panel->icon->width!=panel->pic->width
|
if (!panel->pic) {
|
||||||
|| panel->icon->height!=panel->pic->height) {
|
|
||||||
broken = 1;
|
broken = 1;
|
||||||
RDestroyImage(panel->icon);
|
RDestroyImage(panel->icon);
|
||||||
panel->icon = NULL;
|
panel->icon = NULL;
|
||||||
|
|||||||
Reference in New Issue
Block a user