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

fixed brothr menu texture update bug

Browse Source
This commit is contained in:
kojima
1999-05-19 00:57:36 +00:00
parent 8fb8355a32
commit 4ba9b80c98
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client.c
View File

@@ -734,6 +734,7 @@ wClientGetNormalHints(WWindow *wwin, XWindowAttributes *wattribs, Bool geometry,
void void
GetColormapWindows(WWindow *wwin) GetColormapWindows(WWindow *wwin)
{ {
#ifndef NO_CRASHES
if (wwin->cmap_windows) { if (wwin->cmap_windows) {
XFree(wwin->cmap_windows); XFree(wwin->cmap_windows);
} }
@@ -747,4 +748,5 @@ GetColormapWindows(WWindow *wwin)
wwin->cmap_window_no = 0; wwin->cmap_window_no = 0;
wwin->cmap_windows = NULL; wwin->cmap_windows = NULL;
} }
#endif
} }

10
src/menu.c
View File

@@ -110,6 +110,7 @@ appearanceObserver(void *self, WMNotification *notif)
wMenuRealize(menu); wMenuRealize(menu);
} }
if (flags & WTextureSettings) { if (flags & WTextureSettings) {
if (!menu->flags.brother)
updateTexture(menu); updateTexture(menu);
} }
if (flags & (WTextureSettings|WColorSettings)) { if (flags & (WTextureSettings|WColorSettings)) {
@@ -124,9 +125,10 @@ appearanceObserver(void *self, WMNotification *notif)
if (flags & WTextureSettings) { if (flags & WTextureSettings) {
menu->frame->flags.need_texture_remake = 1; menu->frame->flags.need_texture_remake = 1;
} }
if (flags & (WColorSettings|WTextureSettings)) if (flags & (WColorSettings|WTextureSettings)) {
wFrameWindowPaint(menu->frame); wFrameWindowPaint(menu->frame);
} }
}
} }
/************************************/ /************************************/
@@ -228,13 +230,13 @@ wMenuCreate(WScreen *screen, char *title, int main_menu)
brother = 0; brother = 0;
menu->brother->flags.brother = 1; menu->brother->flags.brother = 1;
menu->brother->brother = menu; menu->brother->brother = menu;
}
WMAddNotificationObserver(appearanceObserver, menu,
WNMenuAppearanceSettingsChanged, menu);
WMAddNotificationObserver(appearanceObserver, menu, WMAddNotificationObserver(appearanceObserver, menu,
WNMenuTitleAppearanceSettingsChanged, menu); WNMenuTitleAppearanceSettingsChanged, menu);
WMAddNotificationObserver(appearanceObserver, menu,
WNMenuAppearanceSettingsChanged, menu);
}
return menu; return menu;
} }

9
src/wconfig.h.in
View File

@@ -178,6 +178,15 @@
#define SILLYNESS #define SILLYNESS
/*
* Define if you're experiencing crashes when launching programs.
* This will disable some important but not essential code.
* Use it until we figure what's wrong.
*/
#undef NO_CRASHES
/* /*
*.......................................................................... *..........................................................................
* The following options WILL NOT BE MADE RUN-TIME. Please do not request. * The following options WILL NOT BE MADE RUN-TIME. Please do not request.