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

Refactorize item drawing: add draw_item() function

This commit is contained in:
Julien Danjou 2008-03-07 16:37:09 +01:00
parent e5069d1b8c
commit ddd4f1c43b
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
awesome-menu.c
View File

@ -213,6 +213,19 @@ compute_match(void)
/* Why not? */
#define MARGIN 10
static void
draw_item(item_t *item, Area geometry)
{
if(item == globalconf.item_selected)
draw_text(globalconf.ctx, geometry, AlignLeft,
MARGIN / 2, globalconf.font, item->data,
globalconf.fg_focus, globalconf.bg_focus);
else
draw_text(globalconf.ctx, geometry, AlignLeft,
MARGIN / 2, globalconf.font, item->data,
globalconf.fg, globalconf.bg);
}
static void
redraw(void)
{
@ -244,15 +257,7 @@ redraw(void)
for(item = globalconf.items; item && geometry.width > 0; item = item->next)
if(item->match)
{
if(item == globalconf.item_selected)
{
draw_text(globalconf.ctx, geometry, AlignLeft,
MARGIN / 2, globalconf.font, item->data, globalconf.fg_focus, globalconf.bg_focus);
selected_item_is_drawn = True;
}
else
draw_text(globalconf.ctx, geometry, AlignLeft,
MARGIN / 2, globalconf.font, item->data, globalconf.fg, globalconf.bg);
draw_item(item, geometry);
len = MARGIN + draw_textwidth(globalconf.display, globalconf.font, item->data);
geometry.x += len;
geometry.width -= len;
@ -274,14 +279,7 @@ redraw(void)
if(geometry.x < prompt_len)
break;
/* XXX need factorizing */
if(item == globalconf.item_selected)
draw_text(globalconf.ctx, geometry, AlignLeft,
MARGIN / 2, globalconf.font, item->data, globalconf.fg_focus, globalconf.bg_focus);
else
draw_text(globalconf.ctx, geometry, AlignLeft,
MARGIN / 2, globalconf.font, item->data, globalconf.fg, globalconf.bg);
draw_item(item, geometry);
}
if(item)