godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve tabbed titlebar render: border around tabbed titlebar & separation in tabbed unfocused client

Browse Source
This commit is contained in:
Martin Duquesnoy
2012-01-12 02:33:19 +01:00
parent f46cbaf501
commit a0cb5793cd
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/client.c
View File

@@ -323,9 +323,9 @@ client_grabbuttons(struct client *c, bool focused)
ButtonMask, GrabModeAsync, GrabModeSync, None, None); ButtonMask, GrabModeAsync, GrabModeSync, None, None);
} }
#define _XTEXT() \ #define _XTEXT() \
if((xt = ((f >> 1) - (w >> 1))) < 0) \ if((xt = ((f >> 1) - (w >> 1))) < 0) \
xt = 1; xt = c->border << 1;
void void
client_frame_update(struct client *c, struct colpair *cp) client_frame_update(struct client *c, struct colpair *cp)
{ {
@@ -365,6 +365,7 @@ client_frame_update(struct client *c, struct colpair *cp)
if(c->flags & CLIENT_TABMASTER && n > 1) if(c->flags & CLIENT_TABMASTER && n > 1)
{ {
int x = f; int x = f;
struct geo g = { 0, 0, 1, c->titlebar->geo.h };
SLIST_FOREACH(cc, &c->tag->clients, tnext) SLIST_FOREACH(cc, &c->tag->clients, tnext)
if(c == cc->tabmaster && cc->titlebar) if(c == cc->tabmaster && cc->titlebar)
@@ -374,18 +375,19 @@ client_frame_update(struct client *c, struct colpair *cp)
w = draw_textw(c->theme, cc->title); w = draw_textw(c->theme, cc->title);
_XTEXT(); _XTEXT();
barwin_map(cc->titlebar);
barwin_reparent(cc->titlebar, c->frame); barwin_reparent(cc->titlebar, c->frame);
barwin_move(cc->titlebar, x, 0); barwin_map(cc->titlebar)
barwin_resize(cc->titlebar, f, c->tbarw); barwin_move(cc->titlebar, x, 1);
barwin_resize(cc->titlebar, f, c->tbarw - 2);
barwin_refresh_color(cc->titlebar); barwin_refresh_color(cc->titlebar);
draw_text(cc->titlebar->dr, c->theme, xt, y, draw_rect(cc->titlebar->dr, g, c->scol.bg);
draw_text(cc->titlebar->dr, c->theme, xt, y - 1,
c->ncol.fg, cc->title); c->ncol.fg, cc->title);
barwin_refresh(cc->titlebar); barwin_refresh(cc->titlebar);
x += f + c->border; x += f;
} }
} }
} }

2
src/status.c
View File

@@ -86,7 +86,7 @@ status_parse(struct element *e)
continue; continue;
/* Then parse & list it */ /* Then parse & list it */
switch((type = *p) ) switch((type = *p))
{ {
/* /*
* Text sequence: \s[left/right;#color;text] OR \s[x;y;#color;text] * Text sequence: \s[left/right;#color;text] OR \s[x;y;#color;text]