mirror of
https://github.com/gryf/wmaker.git
synced 2026-02-10 02:25:46 +01:00
- API change in WINGs for WMDraw*String().
WMDrawString() and WMDrawImageString() now take WMColor instead of GC as arguments. WMDrawImageString() receives 2 colors (text & background). This is to allow easy extension for Xft/Xrender and hide X low level details - Added alpha channel to WMColor. 2 new functions also: WMCreateRGBAColor() and WMSetColorAlpha() - Miscelaneous code cleanups in wtext.c - Removed obsoleted acconfig.h and implemented its functionality using AC_DEFINE and AC_DEFINE_UNQUOTED as autoconf 2.5x recommends. This will definitely enforce the need to use autoconf 2.5x
This commit is contained in:
@@ -612,9 +612,9 @@ paintButton(Button *bPtr)
|
||||
char *caption;
|
||||
WMPixmap *image;
|
||||
WMColor *textColor;
|
||||
GC gc;
|
||||
WMColor *backColor;
|
||||
|
||||
gc = NULL;
|
||||
backColor = NULL;
|
||||
caption = bPtr->caption;
|
||||
|
||||
if (bPtr->flags.enabled) {
|
||||
@@ -637,7 +637,7 @@ paintButton(Button *bPtr)
|
||||
|
||||
if (bPtr->flags.selected) {
|
||||
if (bPtr->flags.stateLight) {
|
||||
gc = WMColorGC(scrPtr->white);
|
||||
backColor = scrPtr->white;
|
||||
textColor = scrPtr->black;
|
||||
}
|
||||
|
||||
@@ -662,7 +662,7 @@ paintButton(Button *bPtr)
|
||||
offset = 1;
|
||||
}
|
||||
if (bPtr->flags.pushLight) {
|
||||
gc = WMColorGC(scrPtr->white);
|
||||
backColor = scrPtr->white;
|
||||
textColor = scrPtr->black;
|
||||
}
|
||||
|
||||
@@ -676,10 +676,10 @@ paintButton(Button *bPtr)
|
||||
}
|
||||
}
|
||||
|
||||
W_PaintTextAndImage(bPtr->view, True, WMColorGC(textColor),
|
||||
W_PaintTextAndImage(bPtr->view, True, textColor,
|
||||
(bPtr->font!=NULL ? bPtr->font : scrPtr->normalFont),
|
||||
relief, caption, bPtr->flags.alignment, image,
|
||||
bPtr->flags.imagePosition, gc, offset);
|
||||
bPtr->flags.imagePosition, backColor, offset);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user