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

Menu: Little optimization

Browse Source
This commit is contained in:
OldMan 2010-04-10 11:21:14 +06:00
parent 466ebca9ea
commit a0258c13d0
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/menu.c
View File

@ -68,7 +68,7 @@ menu_draw(Menu menu, int x, int y)
BarWindow *item[menu.nitem];
BarWindow *frame;
width = menu_get_longer_string(menu.item, menu.nitem);
width = menu_get_longer_string(menu.item, menu.nitem) + PAD;
/* Frame barwin */
frame = barwin_create(ROOT, x, y, width + SHADH, menu.nitem * (INFOBARH - SHADH) + SHADH * 2,
@ -219,7 +219,7 @@ menu_focus_item(Menu *menu, int item, BarWindow *winitem[])
void
menu_draw_item_name(Menu *menu, int item, BarWindow *winitem[])
{
int width = menu_get_longer_string(menu->item, menu->nitem);
int width = menu_get_longer_string(menu->item, menu->nitem) + PAD;
barwin_draw_text(winitem[item],
((width / 2) - (textw(menu->item[item].name) / 2)),
@ -230,15 +230,15 @@ menu_draw_item_name(Menu *menu, int item, BarWindow *winitem[])
}
int
menu_get_longer_string(MenuItem *mt, int nitem)
menu_get_longer_string(MenuItem *mi, int nitem)
{
int i, l = 0;
int i, w, l = 0;
for(i = 0; i < nitem; ++i)
if(textw(mt[i].name) > l)
l = textw(mt[i].name);
if((w = textw(mi[i].name)) > l)
l = w;
return l + PAD;
return l;
}
void

2
src/wmfs.h
View File

@ -237,7 +237,7 @@ void menu_draw(Menu menu, int x, int y);
Bool menu_manage_event(XEvent *ev, Menu *menu, BarWindow *winitem[]);
void menu_focus_item(Menu *menu, int item, BarWindow *winitem[]);
void menu_draw_item_name(Menu *menu, int item, BarWindow *winitem[]);
int menu_get_longer_string(MenuItem *mt, int nitem);
int menu_get_longer_string(MenuItem *mi, int nitem);
void uicb_menu(uicb_t cmd);
/* launcher.c */