gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 04:48:06 +01:00
Code Issues Projects Releases Wiki Activity

fixed bug in WMSetButtonEnabled and WMSetButtonSelected

Browse Source
This commit is contained in:
dan
2002-02-28 11:01:39 +00:00
parent 0c1881e224
commit 1cd1f16c3c
2 changed files with 77 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WINGs/wbutton.c
View File

@@ -410,7 +410,7 @@ WMSetButtonDisabledTextColor(WMButton *bPtr, WMColor *color)
void void
WMSetButtonSelected(WMButton *bPtr, int isSelected) WMSetButtonSelected(WMButton *bPtr, int isSelected)
{ {
bPtr->flags.selected = isSelected; bPtr->flags.selected = isSelected ? 1 : 0;
if (bPtr->view->flags.realized) { if (bPtr->view->flags.realized) {
paintButton(bPtr); paintButton(bPtr);
@@ -453,7 +453,7 @@ WMSetButtonFont(WMButton *bPtr, WMFont *font)
void void
WMSetButtonEnabled(WMButton *bPtr, Bool flag) WMSetButtonEnabled(WMButton *bPtr, Bool flag)
{ {
bPtr->flags.enabled = flag; bPtr->flags.enabled = flag ? 1 : 0;
if (bPtr->view->flags.mapped) { if (bPtr->view->flags.mapped) {
paintButton(bPtr); paintButton(bPtr);

25
WINGs/wfont.c
View File

@@ -472,19 +472,23 @@ changeFontProp(char *fname, char *newprop, int which)
while (*ptr) { while (*ptr) {
if(*ptr == '-') { if(*ptr == '-') {
*bptr = 0; *bptr = 0;
if(part==which) bptr = prop; if(part==which)
else if(part==which+1) bptr = after; bptr = prop;
else if(part==which+1)
bptr = after;
*bptr++ = *ptr; *bptr++ = *ptr;
part++; part++;
} else { } else {
*bptr++ = *ptr; *bptr++ = *ptr;
} ptr++; }
}*bptr = 0; ptr++;
}
*bptr = 0;
snprintf(fname, 255, "%s-%s%s", before, newprop, after); snprintf(fname, 255, "%s-%s%s", before, newprop, after);
} }
WMFont * WMFont*
WMNormalizeFont(WMScreen *scr, WMFont *font) WMNormalizeFont(WMScreen *scr, WMFont *font)
{ {
WMFont *newfont=NULL; WMFont *newfont=NULL;
@@ -505,7 +509,7 @@ WMNormalizeFont(WMScreen *scr, WMFont *font)
} }
WMFont * WMFont*
WMStrengthenFont(WMScreen *scr, WMFont *font) WMStrengthenFont(WMScreen *scr, WMFont *font)
{ {
WMFont *newfont=NULL; WMFont *newfont=NULL;
@@ -525,7 +529,7 @@ WMStrengthenFont(WMScreen *scr, WMFont *font)
} }
WMFont * WMFont*
WMUnstrengthenFont(WMScreen *scr, WMFont *font) WMUnstrengthenFont(WMScreen *scr, WMFont *font)
{ {
WMFont *newfont=NULL; WMFont *newfont=NULL;
@@ -545,7 +549,7 @@ WMUnstrengthenFont(WMScreen *scr, WMFont *font)
} }
WMFont * WMFont*
WMEmphasizeFont(WMScreen *scr, WMFont *font) WMEmphasizeFont(WMScreen *scr, WMFont *font)
{ {
WMFont *newfont=NULL; WMFont *newfont=NULL;
@@ -565,7 +569,7 @@ WMEmphasizeFont(WMScreen *scr, WMFont *font)
} }
WMFont * WMFont*
WMUnemphasizeFont(WMScreen *scr, WMFont *font) WMUnemphasizeFont(WMScreen *scr, WMFont *font)
{ {
WMFont *newfont=NULL; WMFont *newfont=NULL;
@@ -584,7 +588,8 @@ WMUnemphasizeFont(WMScreen *scr, WMFont *font)
return newfont; return newfont;
} }
WMFont *
WMFont*
WMGetFontOfSize(WMScreen *scr, WMFont *font, int size) WMGetFontOfSize(WMScreen *scr, WMFont *font, int size)
{ {
if(!scr || !font || size<1) if(!scr || !font || size<1)