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

fix crash bug in appearance section

Browse Source
This commit is contained in:
kojima
1999-05-30 15:35:46 +00:00
parent 52e674c064
commit 2bff75f4f7
5 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
WPrefs.app/Appearance.c
View File

@@ -713,7 +713,7 @@ renderMenu(_Panel *panel, proplist_t texture, int width, int iheight)
switch (panel->menuStyle) { switch (panel->menuStyle) {
case MSTYLE_NORMAL: case MSTYLE_NORMAL:
tmp = renderTexture(scr, texture, width, iheight, NULL, RBEV_RAISED2); tmp = renderTexture(scr, texture, width, iheight, NULL, RBEV_RAISED2);
pix = XCreatePixmap(dpy, tmp, width, iheight*4, WMScreenDepth(scr)); pix = XCreatePixmap(dpy, tmp, width, iheight*4, WMScreenDepth(scr));
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
XCopyArea(dpy, tmp, pix, gc, 0, 0, width, iheight, 0, iheight*i); XCopyArea(dpy, tmp, pix, gc, 0, 0, width, iheight, 0, iheight*i);
@@ -768,8 +768,6 @@ updatePreviewBox(_Panel *panel, int elements)
int refresh = 0; int refresh = 0;
Pixmap pix; Pixmap pix;
GC gc; GC gc;
WMListItem *item;
TextureListItem *titem;
int colorUpdate = 0; int colorUpdate = 0;
gc = XCreateGC(dpy, WMWidgetXID(panel->win), 0, NULL); gc = XCreateGC(dpy, WMWidgetXID(panel->win), 0, NULL);
@@ -810,6 +808,9 @@ updatePreviewBox(_Panel *panel, int elements)
colorUpdate |= MTITLE_COL; colorUpdate |= MTITLE_COL;
} }
if (elements & (1<<PMITEM)) { if (elements & (1<<PMITEM)) {
WMListItem *item;
TextureListItem *titem;
item = WMGetListItem(panel->texLs, panel->textureIndex[5]); item = WMGetListItem(panel->texLs, panel->textureIndex[5]);
titem = (TextureListItem*)item->clientData; titem = (TextureListItem*)item->clientData;
@@ -832,6 +833,12 @@ updatePreviewBox(_Panel *panel, int elements)
XDrawLine(dpy, panel->preview, gc, 29, 119, 119, 119); XDrawLine(dpy, panel->preview, gc, 29, 119, 119, 119);
} }
if (elements & (1<<PICON)) { if (elements & (1<<PICON)) {
WMListItem *item;
TextureListItem *titem;
item = WMGetListItem(panel->texLs, panel->textureIndex[6]);
titem = (TextureListItem*)item->clientData;
renderPreview(panel, gc, PICON, renderPreview(panel, gc, PICON,
titem->ispixmap ? 0 : RBEV_RAISED3); titem->ispixmap ? 0 : RBEV_RAISED3);

1
WPrefs.app/Makefile.in
View File

@@ -89,6 +89,7 @@ XGETTEXT = @XGETTEXT@
XLFLAGS = @XLFLAGS@ XLFLAGS = @XLFLAGS@
XLIBS = @XLIBS@ XLIBS = @XLIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBRARY_PATH = @X_LIBRARY_PATH@
wprefsdir = @wprefsdir@ wprefsdir = @wprefsdir@
SUBDIRS = xpm tiff po SUBDIRS = xpm tiff po

1
WPrefs.app/po/Makefile.in
View File

@@ -89,6 +89,7 @@ XGETTEXT = @XGETTEXT@
XLFLAGS = @XLFLAGS@ XLFLAGS = @XLFLAGS@
XLIBS = @XLIBS@ XLIBS = @XLIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBRARY_PATH = @X_LIBRARY_PATH@
wprefsdir = @wprefsdir@ wprefsdir = @wprefsdir@
CATALOGS = @WPMOFILES@ CATALOGS = @WPMOFILES@

1
WPrefs.app/tiff/Makefile.in
View File

@@ -89,6 +89,7 @@ XGETTEXT = @XGETTEXT@
XLFLAGS = @XLFLAGS@ XLFLAGS = @XLFLAGS@
XLIBS = @XLIBS@ XLIBS = @XLIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBRARY_PATH = @X_LIBRARY_PATH@
wprefsdir = @wprefsdir@ wprefsdir = @wprefsdir@
tiffdatadir = $(wprefsdir)/tiff tiffdatadir = $(wprefsdir)/tiff

1
WPrefs.app/xpm/Makefile.in
View File

@@ -89,6 +89,7 @@ XGETTEXT = @XGETTEXT@
XLFLAGS = @XLFLAGS@ XLFLAGS = @XLFLAGS@
XLIBS = @XLIBS@ XLIBS = @XLIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBRARY_PATH = @X_LIBRARY_PATH@
wprefsdir = @wprefsdir@ wprefsdir = @wprefsdir@
xpmdatadir = $(wprefsdir)/xpm xpmdatadir = $(wprefsdir)/xpm