mirror of
https://github.com/awesomeWM/awesome
synced 2024-11-17 07:47:41 +01:00
[awesome-menu] Better handling of selected item that are drawn in the end of the list
This commit is contained in:
parent
e668bf8dc3
commit
4a41a50a39
1 changed files with 10 additions and 6 deletions
|
@ -354,9 +354,8 @@ redraw(void)
|
||||||
{
|
{
|
||||||
item_t *item;
|
item_t *item;
|
||||||
Area geometry = { 0, 0, 0, 0, NULL };
|
Area geometry = { 0, 0, 0, 0, NULL };
|
||||||
unsigned int len;
|
|
||||||
Bool selected_item_is_drawn = False;
|
Bool selected_item_is_drawn = False;
|
||||||
int prompt_len, x_of_previous_item;
|
int len, prompt_len, x_of_previous_item;
|
||||||
|
|
||||||
geometry.width = globalconf.sw->geometry.width;
|
geometry.width = globalconf.sw->geometry.width;
|
||||||
geometry.height = globalconf.sw->geometry.height;
|
geometry.height = globalconf.sw->geometry.height;
|
||||||
|
@ -384,13 +383,18 @@ redraw(void)
|
||||||
geometry.width -= len;
|
geometry.width -= len;
|
||||||
prompt_len = geometry.x;
|
prompt_len = geometry.x;
|
||||||
|
|
||||||
for(item = globalconf.items; item && geometry.width > 0; item = item->next)
|
for(item = globalconf.items; item; item = item->next)
|
||||||
if(item->match)
|
if(item->match)
|
||||||
{
|
{
|
||||||
if(item == globalconf.item_selected)
|
|
||||||
selected_item_is_drawn = True;
|
|
||||||
draw_item(item, geometry);
|
|
||||||
len = MARGIN + draw_textwidth(globalconf.display, globalconf.font, item->data);
|
len = MARGIN + draw_textwidth(globalconf.display, globalconf.font, item->data);
|
||||||
|
if(item == globalconf.item_selected)
|
||||||
|
{
|
||||||
|
if(len > geometry.width)
|
||||||
|
break;
|
||||||
|
else
|
||||||
|
selected_item_is_drawn = True;
|
||||||
|
}
|
||||||
|
draw_item(item, geometry);
|
||||||
geometry.x += len;
|
geometry.x += len;
|
||||||
geometry.width -= len;
|
geometry.width -= len;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue