mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-19 20:38:08 +01:00
fix bug with alpha transparent xpm
This commit is contained in:
@@ -89,6 +89,7 @@ XGETTEXT = @XGETTEXT@
|
||||
XLFLAGS = @XLFLAGS@
|
||||
XLIBS = @XLIBS@
|
||||
X_EXTRA_LIBS = @X_EXTRA_LIBS@
|
||||
X_LIBRARY_PATH = @X_LIBRARY_PATH@
|
||||
wprefsdir = @wprefsdir@
|
||||
|
||||
AUTOMAKE_OPTIONS = no-dependencies
|
||||
|
||||
16
wrlib/xpm.c
16
wrlib/xpm.c
@@ -99,16 +99,10 @@ RGetImageFromXPMData(RContext *context, char **data)
|
||||
XColor xcolor;
|
||||
|
||||
if (strncmp(xpm.colorTable[i].c_color,"None",4)==0) {
|
||||
if (context->dpy) {
|
||||
/* ??? */
|
||||
color_table[0][i]=context->red_offset;
|
||||
color_table[1][i]=context->red_offset;
|
||||
color_table[2][i]=context->red_offset;
|
||||
} else {
|
||||
color_table[0][i]=0;
|
||||
color_table[1][i]=0;
|
||||
color_table[2][i]=0;
|
||||
}
|
||||
transp = i;
|
||||
continue;
|
||||
}
|
||||
if (XParseColor(dpy, cmap, xpm.colorTable[i].c_color, &xcolor)) {
|
||||
@@ -213,17 +207,9 @@ RLoadXPM(RContext *context, char *file, int index)
|
||||
XColor xcolor;
|
||||
|
||||
if (strncmp(xpm.colorTable[i].c_color,"None",4)==0) {
|
||||
if (context->dpy) {
|
||||
/* ??? */
|
||||
color_table[0][i]=context->red_offset;
|
||||
color_table[1][i]=context->red_offset;
|
||||
color_table[2][i]=context->red_offset;
|
||||
} else {
|
||||
color_table[0][i]=0;
|
||||
color_table[1][i]=0;
|
||||
color_table[2][i]=0;
|
||||
}
|
||||
|
||||
transp = i;
|
||||
continue;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user