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

remove default for titlebar_extend_space ( I've removed it so I am not

Browse Source 
sure what I just removed ) and change to

#define DEF_WINDOW_TITLE_EXTEND_SPACE "4"
#define DEF_MENU_TITLE_EXTEND_SPACE "4"
#define DEF_MENU_TEXT_EXTEND_SPACE "0"
This commit is contained in:
id
2000-02-24 22:31:00 +00:00
parent 08e7220dfe
commit 2f9eb0703b
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/framewin.c
View File

@@ -138,7 +138,7 @@ wFrameWindowUpdateBorders(WFrameWindow *fwin, int flags)
height = fwin->core->height - fwin->top_width - fwin->bottom_width; height = fwin->core->height - fwin->top_width - fwin->bottom_width;
if (flags & WFF_TITLEBAR) if (flags & WFF_TITLEBAR)
theight = WMFontHeight(*fwin->font) + TITLEBAR_EXTRA_HEIGHT + *fwin->title_clearance * 2; theight = WMFontHeight(*fwin->font) + *fwin->title_clearance * 2;
else else
theight = 0; theight = 0;
@@ -476,7 +476,7 @@ updateTitlebar(WFrameWindow *fwin)
int x, w; int x, w;
int theight; int theight;
theight = WMFontHeight(*fwin->font) + TITLEBAR_EXTRA_HEIGHT + *fwin->title_clearance * 2; theight = WMFontHeight(*fwin->font) + *fwin->title_clearance * 2;
x = 0; x = 0;
w = fwin->core->width + 1; w = fwin->core->width + 1;
@@ -1087,16 +1087,16 @@ wFrameWindowPaint(WFrameWindow *fwin)
proc.drawString(scr->drawstring_func[fwin->flags.state proc.drawString(scr->drawstring_func[fwin->flags.state
+ fwin->drawstring_proc_offset]->arg, + fwin->drawstring_proc_offset]->arg,
fwin->titlebar->window, *fwin->title_gc, fwin->titlebar->window, *fwin->title_gc,
*fwin->font, x, *fwin->title_clearance + TITLEBAR_EXTRA_HEIGHT/2, *fwin->font, x, *fwin->title_clearance,
fwin->titlebar->width, fwin->top_width, title, titlelen); fwin->titlebar->width, fwin->top_width, title, titlelen);
} else { } else {
WMDrawString(scr->wmscreen, fwin->titlebar->window, WMDrawString(scr->wmscreen, fwin->titlebar->window,
*fwin->title_gc, *fwin->font, x, *fwin->title_clearance + TITLEBAR_EXTRA_HEIGHT/2, *fwin->title_gc, *fwin->font, x, *fwin->title_clearance,
title, titlelen); title, titlelen);
} }
#else #else
WMDrawString(scr->wmscreen, fwin->titlebar->window, WMDrawString(scr->wmscreen, fwin->titlebar->window,
*fwin->title_gc, *fwin->font, x, *fwin->title_clearance + TITLEBAR_EXTRA_HEIGHT/2, *fwin->title_gc, *fwin->font, x, *fwin->title_clearance,
title, titlelen); title, titlelen);
#endif /* DRAWSTRING_PLUGIN */ #endif /* DRAWSTRING_PLUGIN */

6
src/moveres.c
View File

@@ -427,7 +427,7 @@ drawTransparentFrame(WWindow *wwin, int x, int y, int width, int height)
int bottom = 0; int bottom = 0;
if (!WFLAGP(wwin, no_titlebar) && !wwin->flags.shaded) { if (!WFLAGP(wwin, no_titlebar) && !wwin->flags.shaded) {
h = WMFontHeight(wwin->screen_ptr->title_font) + TITLEBAR_EXTRA_HEIGHT; h = WMFontHeight(wwin->screen_ptr->title_font) + wPreferences.window_title_clearance * 2;
} }
if (!WFLAGP(wwin, no_resizebar) && !wwin->flags.shaded) { if (!WFLAGP(wwin, no_resizebar) && !wwin->flags.shaded) {
/* Can't use wwin-frame->bottom_width because, in some cases /* Can't use wwin-frame->bottom_width because, in some cases
@@ -1852,7 +1852,7 @@ wMouseResizeWindow(WWindow *wwin, XEvent *ev)
shiftl = XKeysymToKeycode(dpy, XK_Shift_L); shiftl = XKeysymToKeycode(dpy, XK_Shift_L);
shiftr = XKeysymToKeycode(dpy, XK_Shift_R); shiftr = XKeysymToKeycode(dpy, XK_Shift_R);
if (!WFLAGP(wwin, no_titlebar)) if (!WFLAGP(wwin, no_titlebar))
h = WMFontHeight(wwin->screen_ptr->title_font) + TITLEBAR_EXTRA_HEIGHT; h = WMFontHeight(wwin->screen_ptr->title_font) + wPreferences.window_title_clearance * 2;
else else
h = 0; h = 0;
while (1) { while (1) {
@@ -2155,7 +2155,7 @@ InteractivePlaceWindow(WWindow *wwin, int *x_ret, int *y_ret,
return; return;
} }
if (!WFLAGP(wwin, no_titlebar)) { if (!WFLAGP(wwin, no_titlebar)) {
h = WMFontHeight(scr->title_font) + TITLEBAR_EXTRA_HEIGHT; h = WMFontHeight(scr->title_font) + wPreferences.window_title_clearance * 2;
height += h; height += h;
} }
if (!WFLAGP(wwin, no_resizebar)) { if (!WFLAGP(wwin, no_resizebar)) {

2
src/placement.c
View File

@@ -553,7 +553,7 @@ PlaceWindow(WWindow *wwin, int *x_ret, int *y_ret,
unsigned width, unsigned height) unsigned width, unsigned height)
{ {
WScreen *scr = wwin->screen_ptr; WScreen *scr = wwin->screen_ptr;
int h = WMFontHeight(scr->title_font) + TITLEBAR_EXTRA_HEIGHT; int h = WMFontHeight(scr->title_font) + wPreferences.window_title_clearance * 2;
switch (wPreferences.window_placement) { switch (wPreferences.window_placement) {
case WPM_MANUAL: case WPM_MANUAL:

8
src/wconfig.h.in
View File

@@ -311,9 +311,9 @@
#define DEF_FRAME_THICKNESS 1 /* linewidth of the move/resize frame */ #define DEF_FRAME_THICKNESS 1 /* linewidth of the move/resize frame */
#define DEF_WINDOW_TITLE_EXTEND_SPACE 0 #define DEF_WINDOW_TITLE_EXTEND_SPACE "4"
#define DEF_MENU_TITLE_EXTEND_SPACE 0 #define DEF_MENU_TITLE_EXTEND_SPACE "4"
#define DEF_MENU_TEXT_EXTEND_SPACE 0 #define DEF_MENU_TEXT_EXTEND_SPACE "0"
#define DEF_XPM_CLOSENESS 40000 #define DEF_XPM_CLOSENESS 40000
@@ -534,8 +534,6 @@
#define RESIZEBAR_MIN_WIDTH 20 /* min. width of handles-corner_width */ #define RESIZEBAR_MIN_WIDTH 20 /* min. width of handles-corner_width */
#define RESIZEBAR_CORNER_WIDTH 28 /* width of the corner of resizebars */ #define RESIZEBAR_CORNER_WIDTH 28 /* width of the corner of resizebars */
#define TITLEBAR_EXTRA_HEIGHT 8
#define MENU_INDICATOR_SPACE 12 #define MENU_INDICATOR_SPACE 12
/* minimum size for windows */ /* minimum size for windows */