mirror of
https://github.com/gryf/wmaker.git
synced 2026-03-29 18:33:33 +02: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:
@@ -1329,11 +1329,11 @@ paintListItem(WMList *lPtr, int index, Drawable d, char *text, int state,
|
||||
else if (titem->selectedFor)
|
||||
WMDrawPixmap(panel->offLed, d, x + TEXPREV_WIDTH + 10, y + 6);
|
||||
|
||||
WMDrawString(scr, d, WMColorGC(black), panel->boldFont,
|
||||
WMDrawString(scr, d, black, panel->boldFont,
|
||||
x + TEXPREV_WIDTH + 22, y + 2, titem->title,
|
||||
strlen(titem->title));
|
||||
|
||||
WMDrawString(scr, d, WMColorGC(black), panel->smallFont,
|
||||
WMDrawString(scr, d, black, panel->smallFont,
|
||||
x + TEXPREV_WIDTH + 14, y + 18, titem->texture,
|
||||
strlen(titem->texture));
|
||||
|
||||
@@ -1512,8 +1512,8 @@ paintText(WMScreen *scr, Drawable d, WMColor *color, WMFont *font,
|
||||
x += (w - WMWidthOfString(font, text, l))/2;
|
||||
break;
|
||||
}
|
||||
WMDrawString(scr, d, WMColorGC(color), font, x,
|
||||
y + (h - WMFontHeight(font))/2, text, l);
|
||||
WMDrawString(scr, d, color, font, x, y + (h - WMFontHeight(font))/2,
|
||||
text, l);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user