fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix listbox_fix_visible_region()

Browse Source 
Make sure that listbox_fix_visible_region() always updates the visible
region to show the entire list if it fits into the box. Also, reuse
listbox_fix_visible_region() in listbox_resize() instead of duplicating
the code.

Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lukas Fleischer 2016-10-30 11:42:24 +01:00
parent 0d74c14fd1
commit cf75caeb61
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/listbox.c
View File

@ -60,6 +60,25 @@ void listbox_delete(struct listbox *lb)
mem_free(lb->ch); mem_free(lb->ch);
} }
static void listbox_fix_visible_region(struct listbox *lb)
{
unsigned last_line = lb->ch[lb->item_count] - 1;
int i;
wins_scrollwin_ensure_visible(&(lb->sw), lb->ch[lb->item_sel]);
wins_scrollwin_ensure_visible(&(lb->sw), lb->ch[lb->item_sel + 1] - 1);
i = lb->item_sel - 1;
while (i >= 0 && lb->type[i] != LISTBOX_ROW_TEXT) {
wins_scrollwin_ensure_visible(&(lb->sw), lb->ch[i]);
wins_scrollwin_ensure_visible(&(lb->sw), lb->ch[i + 1] - 1);
i++;
}
if (wins_scrollwin_is_visible(&(lb->sw), last_line))
wins_scrollwin_set_lower(&(lb->sw), last_line);
}
void listbox_resize(struct listbox *lb, int y, int x, int h, int w) void listbox_resize(struct listbox *lb, int y, int x, int h, int w)
{ {
EXIT_IF(lb == NULL, "null pointer"); EXIT_IF(lb == NULL, "null pointer");
@ -68,13 +87,7 @@ void listbox_resize(struct listbox *lb, int y, int x, int h, int w)
if (lb->item_sel < 0) if (lb->item_sel < 0)
return; return;
unsigned last_line = lb->ch[lb->item_count] - 1; listbox_fix_visible_region(lb);
if (wins_scrollwin_is_visible(&(lb->sw), last_line))
wins_scrollwin_set_lower(&(lb->sw), last_line);
wins_scrollwin_ensure_visible(&(lb->sw), lb->ch[lb->item_sel]);
wins_scrollwin_ensure_visible(&(lb->sw), lb->ch[lb->item_sel + 1] - 1);
} }
void listbox_set_cb_data(struct listbox *lb, void *cb_data) void listbox_set_cb_data(struct listbox *lb, void *cb_data)
@ -163,21 +176,6 @@ static void listbox_fix_sel(struct listbox *lb, int direction)
} }
} }
static void listbox_fix_visible_region(struct listbox *lb)
{
int i;
wins_scrollwin_ensure_visible(&(lb->sw), lb->ch[lb->item_sel]);
wins_scrollwin_ensure_visible(&(lb->sw), lb->ch[lb->item_sel + 1] - 1);
i = lb->item_sel - 1;
while (i >= 0 && lb->type[i] != LISTBOX_ROW_TEXT) {
wins_scrollwin_ensure_visible(&(lb->sw), lb->ch[i]);
wins_scrollwin_ensure_visible(&(lb->sw), lb->ch[i + 1] - 1);
i++;
}
}
void listbox_set_sel(struct listbox *lb, unsigned pos) void listbox_set_sel(struct listbox *lb, unsigned pos)
{ {
lb->item_sel = pos; lb->item_sel = pos;