1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 04:48:06 +01:00

0.51.1 pre snapshot. Be careful, it may be buggy. It fixes some bugs though.

This commit is contained in:
dan
1999-02-17 11:06:40 +00:00
parent 931a37b124
commit e7495baff7
189 changed files with 16952 additions and 9682 deletions

View File

@@ -114,10 +114,13 @@ wFrameWindowUpdateBorders(WFrameWindow *fwin, int flags)
int width, height;
int i;
WScreen *scr = fwin->screen_ptr;
width = fwin->core->width;
height = fwin->core->height - fwin->top_width - fwin->bottom_width;
if (flags & WFF_IS_SHADED)
height = -1;
else
height = fwin->core->height - fwin->top_width - fwin->bottom_width;
if (flags & WFF_TITLEBAR)
theight = (*fwin->font)->height + TITLEBAR_EXTRA_HEIGHT;
else
@@ -283,10 +286,11 @@ wFrameWindowUpdateBorders(WFrameWindow *fwin, int flags)
fwin->resizebar = NULL;
}
}
if (height + fwin->top_width + fwin->bottom_width != fwin->core->height) {
if (height + fwin->top_width + fwin->bottom_width != fwin->core->height
&& !(flags & WFF_IS_SHADED)) {
wFrameWindowResize(fwin, width,
height + fwin->top_width + fwin->bottom_width);
height + fwin->top_width + fwin->bottom_width);
}
/* setup object descriptors */
@@ -757,14 +761,6 @@ wFrameWindowPaint(WFrameWindow *fwin)
break;
}
XSetForeground(dpy, *fwin->title_gc,
fwin->title_pixel[fwin->flags.state]);
wDrawString(fwin->titlebar->window, *fwin->font,
*fwin->title_gc, x,
(*fwin->font)->y + TITLEBAR_EXTRA_HEIGHT/2, title,
titlelen);
#ifdef TITLE_TEXT_SHADOW
if(wPreferences.title_shadow){
int shadowx,shadowy;
@@ -781,6 +777,14 @@ wFrameWindowPaint(WFrameWindow *fwin)
}
#endif /* TITLE_TEXT_SHADOW */
XSetForeground(dpy, *fwin->title_gc,
fwin->title_pixel[fwin->flags.state]);
wDrawString(fwin->titlebar->window, *fwin->font,
*fwin->title_gc, x,
(*fwin->font)->y + TITLEBAR_EXTRA_HEIGHT/2, title,
titlelen);
free(title);
}
}