gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-29 11:35:47 +01:00
Code Issues Projects Releases Wiki Activity

bug fix for balloons and some other minor things

Browse Source
This commit is contained in:
kojima
1999-04-25 01:47:51 +00:00
parent a0ebbef813
commit 2c1f4634e3
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WINGs/WINGsP.h
View File

@@ -196,7 +196,7 @@ typedef struct W_Screen {
struct W_Pixmap *altHomeIcon; struct W_Pixmap *altHomeIcon;
struct W_Pixmap *magnifyIcon; struct W_Pixmap *magnifyIcon;
struct W_Pixmap *altMagnifyIcon; /* struct W_Pixmap *altMagnifyIcon;*/
struct W_Pixmap *wheelIcon; struct W_Pixmap *wheelIcon;
struct W_Pixmap *grayIcon; struct W_Pixmap *grayIcon;
struct W_Pixmap *rgbIcon; struct W_Pixmap *rgbIcon;

4
WINGs/wballoon.c
View File

@@ -366,8 +366,8 @@ showText(Balloon *bPtr, int x, int y, int h, int w, char *text)
{ {
int w; int w;
char *ptr, *ptr2; char *ptr, *ptr2;
ptr = text; ptr2 = ptr = text;
width = 0; width = 0;
while (ptr && ptr2) { while (ptr && ptr2) {
ptr2 = strchr(ptr, '\n'); ptr2 = strchr(ptr, '\n');

12
WINGs/wbutton.c
View File

@@ -283,11 +283,13 @@ WMSetButtonImage(WMButton *bPtr, WMPixmap *image)
WMReleasePixmap(bPtr->dimage); WMReleasePixmap(bPtr->dimage);
} }
bPtr->dimage = WMCreatePixmapFromXPixmaps(WMWidgetScreen(bPtr), if (image) {
image->pixmap, None, bPtr->dimage = WMCreatePixmapFromXPixmaps(WMWidgetScreen(bPtr),
image->width, image->height, image->pixmap, None,
image->depth); image->width, image->height,
updateDisabledMask(bPtr); image->depth);
updateDisabledMask(bPtr);
}
if (bPtr->view->flags.realized) { if (bPtr->view->flags.realized) {
paintButton(bPtr); paintButton(bPtr);

2
WINGs/widgets.c
View File

@@ -468,10 +468,12 @@ loadPixmaps(WMScreen *scr)
RCombineImageWithColor(tmp, &gray); RCombineImageWithColor(tmp, &gray);
scr->magnifyIcon = WMCreatePixmapFromRImage(scr, tmp, 128); scr->magnifyIcon = WMCreatePixmapFromRImage(scr, tmp, 128);
RDestroyImage(tmp); RDestroyImage(tmp);
/*
tmp = RGetSubImage(image, 24, 0, 40, 32); tmp = RGetSubImage(image, 24, 0, 40, 32);
RCombineImageWithColor(tmp, &white); RCombineImageWithColor(tmp, &white);
scr->altMagnifyIcon = WMCreatePixmapFromRImage(scr, tmp, 128); scr->altMagnifyIcon = WMCreatePixmapFromRImage(scr, tmp, 128);
RDestroyImage(tmp); RDestroyImage(tmp);
*/
/* ColorWheel Icon for ColorPanel */ /* ColorWheel Icon for ColorPanel */
tmp = RGetSubImage(image, 0, 25, 24, 24); tmp = RGetSubImage(image, 0, 25, 24, 24);
scr->wheelIcon = WMCreatePixmapFromRImage(scr, tmp, 128); scr->wheelIcon = WMCreatePixmapFromRImage(scr, tmp, 128);