mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-19 12:28:22 +01:00
fixed bug in WMSetButtonEnabled and WMSetButtonSelected
This commit is contained in:
@@ -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);
|
||||||
|
|||||||
@@ -472,14 +472,18 @@ 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -584,6 +588,7 @@ 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)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user