awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Factorize some code with taglist_style_get()

This commit is contained in:
Julien Danjou 2008-03-14 09:35:40 +01:00
parent d10b98c101
commit a2082ffbae
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
widgets/taglist.c
View File

@ -58,6 +58,17 @@ isurgent(Tag *t)
return False; return False;
} }
static style_t
taglist_style_get(VirtScreen vscreen, Tag *tag)
{
if(tag->selected)
return vscreen.styles.focus;
else if(isurgent(tag))
return vscreen.styles.urgent;
return vscreen.styles.normal;
}
static int static int
taglist_draw(Widget *widget, taglist_draw(Widget *widget,
DrawCtx *ctx, DrawCtx *ctx,
@ -94,12 +105,7 @@ taglist_draw(Widget *widget,
widget->area.width = 0; widget->area.width = 0;
for(tag = vscreen.tags; tag; tag = tag->next) for(tag = vscreen.tags; tag; tag = tag->next)
{ {
if(tag->selected) style = taglist_style_get(vscreen, tag);
style = vscreen.styles.focus;
else if(isurgent(tag))
style = vscreen.styles.urgent;
else
style = vscreen.styles.normal;
w = draw_textwidth(ctx->display, style.font, tag->name) + style.font->height; w = draw_textwidth(ctx->display, style.font, tag->name) + style.font->height;
area.x = widget->area.x + widget->area.width; area.x = widget->area.x + widget->area.width;
area.y = widget->area.y; area.y = widget->area.y;
@ -140,14 +146,7 @@ taglist_button_press(Widget *widget, XButtonPressedEvent *ev)
for(b = widget->buttons; b; b = b->next) for(b = widget->buttons; b; b = b->next)
if(ev->button == b->button && CLEANMASK(ev->state) == b->mod && b->func) if(ev->button == b->button && CLEANMASK(ev->state) == b->mod && b->func)
{ {
/* XXX this should be in a function */ style = taglist_style_get(vscreen, tag);
if(tag->selected)
style = vscreen.styles.focus;
else if(isurgent(tag))
style = vscreen.styles.urgent;
else
style = vscreen.styles.normal;
switch(widget->statusbar->position) switch(widget->statusbar->position)
{ {
case Top: case Top: