mirror of
https://github.com/gryf/wmaker.git
synced 2026-01-11 08:54:14 +01:00
bug fix for balloons and some other minor things
This commit is contained in:
@@ -196,7 +196,7 @@ typedef struct W_Screen {
|
||||
struct W_Pixmap *altHomeIcon;
|
||||
|
||||
struct W_Pixmap *magnifyIcon;
|
||||
struct W_Pixmap *altMagnifyIcon;
|
||||
/* struct W_Pixmap *altMagnifyIcon;*/
|
||||
struct W_Pixmap *wheelIcon;
|
||||
struct W_Pixmap *grayIcon;
|
||||
struct W_Pixmap *rgbIcon;
|
||||
|
||||
@@ -366,8 +366,8 @@ showText(Balloon *bPtr, int x, int y, int h, int w, char *text)
|
||||
{
|
||||
int w;
|
||||
char *ptr, *ptr2;
|
||||
|
||||
ptr = text;
|
||||
|
||||
ptr2 = ptr = text;
|
||||
width = 0;
|
||||
while (ptr && ptr2) {
|
||||
ptr2 = strchr(ptr, '\n');
|
||||
|
||||
@@ -283,11 +283,13 @@ WMSetButtonImage(WMButton *bPtr, WMPixmap *image)
|
||||
WMReleasePixmap(bPtr->dimage);
|
||||
}
|
||||
|
||||
bPtr->dimage = WMCreatePixmapFromXPixmaps(WMWidgetScreen(bPtr),
|
||||
image->pixmap, None,
|
||||
image->width, image->height,
|
||||
image->depth);
|
||||
updateDisabledMask(bPtr);
|
||||
if (image) {
|
||||
bPtr->dimage = WMCreatePixmapFromXPixmaps(WMWidgetScreen(bPtr),
|
||||
image->pixmap, None,
|
||||
image->width, image->height,
|
||||
image->depth);
|
||||
updateDisabledMask(bPtr);
|
||||
}
|
||||
|
||||
if (bPtr->view->flags.realized) {
|
||||
paintButton(bPtr);
|
||||
|
||||
@@ -468,10 +468,12 @@ loadPixmaps(WMScreen *scr)
|
||||
RCombineImageWithColor(tmp, &gray);
|
||||
scr->magnifyIcon = WMCreatePixmapFromRImage(scr, tmp, 128);
|
||||
RDestroyImage(tmp);
|
||||
/*
|
||||
tmp = RGetSubImage(image, 24, 0, 40, 32);
|
||||
RCombineImageWithColor(tmp, &white);
|
||||
scr->altMagnifyIcon = WMCreatePixmapFromRImage(scr, tmp, 128);
|
||||
RDestroyImage(tmp);
|
||||
*/
|
||||
/* ColorWheel Icon for ColorPanel */
|
||||
tmp = RGetSubImage(image, 0, 25, 24, 24);
|
||||
scr->wheelIcon = WMCreatePixmapFromRImage(scr, tmp, 128);
|
||||
|
||||
Reference in New Issue
Block a user