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

Avoid blank space after the last list box item

Browse Source 
Automatically scroll down the list box when resizing creates some blank
space below the list of items.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2014-05-19 11:07:52 +02:00
parent 990897b2f0
commit 0b46ad4faa
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calcurse.h
View File

@ -1100,7 +1100,9 @@ void wins_scrollwin_draw_deco(struct scrollwin *, int);
void wins_scrollwin_display(struct scrollwin *); void wins_scrollwin_display(struct scrollwin *);
void wins_scrollwin_up(struct scrollwin *, int); void wins_scrollwin_up(struct scrollwin *, int);
void wins_scrollwin_down(struct scrollwin *, int); void wins_scrollwin_down(struct scrollwin *, int);
int wins_scrollwin_is_visible(struct scrollwin *, unsigned);
void wins_scrollwin_ensure_visible(struct scrollwin *, unsigned); void wins_scrollwin_ensure_visible(struct scrollwin *, unsigned);
void wins_scrollwin_set_lower(struct scrollwin *, unsigned);
void wins_resize(void); void wins_resize(void);
void wins_resize_panels(void); void wins_resize_panels(void);
void wins_show(WINDOW *, const char *); void wins_show(WINDOW *, const char *);

5
src/listbox.c
View File

@ -68,6 +68,11 @@ 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;
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]);
wins_scrollwin_ensure_visible(&(lb->sw), lb->ch[lb->item_sel + 1] - 1); wins_scrollwin_ensure_visible(&(lb->sw), lb->ch[lb->item_sel + 1] - 1);
} }

12
src/wins.c
View File

@ -386,6 +386,12 @@ void wins_scrollwin_down(struct scrollwin *sw, int amount)
sw->line_off = sw->line_num - inner_h; sw->line_off = sw->line_num - inner_h;
} }
int wins_scrollwin_is_visible(struct scrollwin *sw, unsigned line)
{
int inner_h = sw->h - (conf.compact_panels ? 2 : 4);
return ((line >= sw->line_off) && (line < sw->line_off + inner_h));
}
void wins_scrollwin_ensure_visible(struct scrollwin *sw, unsigned line) void wins_scrollwin_ensure_visible(struct scrollwin *sw, unsigned line)
{ {
int inner_h = sw->h - (conf.compact_panels ? 2 : 4); int inner_h = sw->h - (conf.compact_panels ? 2 : 4);
@ -396,6 +402,12 @@ void wins_scrollwin_ensure_visible(struct scrollwin *sw, unsigned line)
sw->line_off = line - inner_h + 1; sw->line_off = line - inner_h + 1;
} }
void wins_scrollwin_set_lower(struct scrollwin *sw, unsigned line)
{
int inner_h = sw->h - (conf.compact_panels ? 2 : 4);
sw->line_off = MAX((int)line - inner_h + 1, 0);
}
void wins_resize_panels(void) void wins_resize_panels(void)
{ {
wins_get_config(); wins_get_config();