p
/
nncmpp
1
1
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

X11: make the scrollbar span the full height

This commit is contained in:
Přemysl Eric Janouch 2022-09-03 13:02:47 +02:00
parent 8529f24a46
commit 7e74d1a80a
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nncmpp.c
View File

@ -2014,7 +2014,7 @@ app_layout_header (void)
} }
static int static int
app_visible_items (void) app_visible_items_height (void)
{ {
struct widget *list = NULL; struct widget *list = NULL;
LIST_FOR_EACH (struct widget, w, g.widgets.head) LIST_FOR_EACH (struct widget, w, g.widgets.head)
@ -2024,7 +2024,13 @@ app_visible_items (void)
hard_assert (list != NULL); hard_assert (list != NULL);
// The raw number of items that would have fit on the terminal // The raw number of items that would have fit on the terminal
return MAX (0, list->height / g.ui_vunit); return MAX (0, list->height);
}
static int
app_visible_items (void)
{
return app_visible_items_height () / g.ui_vunit;
} }
/// Figure out scrollbar appearance. @a s is the minimal slider length as well /// Figure out scrollbar appearance. @a s is the minimal slider length as well
@ -2032,7 +2038,7 @@ app_visible_items (void)
struct scrollbar { long length, start; } struct scrollbar { long length, start; }
app_compute_scrollbar (struct tab *tab, long visible, long s) app_compute_scrollbar (struct tab *tab, long visible, long s)
{ {
long top = tab->item_top, total = tab->item_count; long top = s * tab->item_top, total = s * tab->item_count;
if (total < visible) if (total < visible)
return (struct scrollbar) { 0, 0 }; return (struct scrollbar) { 0, 0 };
if (visible == 1) if (visible == 1)
@ -2042,7 +2048,7 @@ app_compute_scrollbar (struct tab *tab, long visible, long s)
// Only be at the top or bottom when the top or bottom item can be seen. // Only be at the top or bottom when the top or bottom item can be seen.
// The algorithm isn't optimal but it's a bitch to get right. // The algorithm isn't optimal but it's a bitch to get right.
double available_length = s * visible - 2 - s + 1; double available_length = visible - 2 - s + 1;
double lenf = s + available_length * visible / total, length = 0.; double lenf = s + available_length * visible / total, length = 0.;
long offset = 1 + available_length * top / total + modf (lenf, &length); long offset = 1 + available_length * top / total + modf (lenf, &length);
@ -2050,7 +2056,7 @@ app_compute_scrollbar (struct tab *tab, long visible, long s)
if (top == 0) if (top == 0)
return (struct scrollbar) { length, 0 }; return (struct scrollbar) { length, 0 };
if (top + visible >= total) if (top + visible >= total)
return (struct scrollbar) { length, s * visible - length }; return (struct scrollbar) { length, visible - length };
return (struct scrollbar) { length, offset }; return (struct scrollbar) { length, offset };
} }
@ -5171,7 +5177,7 @@ tui_render_scrollbar (struct widget *self)
return; return;
} }
struct scrollbar bar = app_compute_scrollbar (tab, visible_items, 8); struct scrollbar bar = app_compute_scrollbar (tab, visible_items * 8, 8);
bar.length += bar.start; bar.length += bar.start;
int start_part = bar.start % 8; bar.start /= 8; int start_part = bar.start % 8; bar.start /= 8;
@ -5791,10 +5797,8 @@ x11_render_scrollbar (struct widget *self)
x11_render_padding (self); x11_render_padding (self);
struct tab *tab = g.active_tab; struct tab *tab = g.active_tab;
// FIXME: This isn't an integer number in this case.
int visible_items = app_visible_items ();
struct scrollbar bar = struct scrollbar bar =
app_compute_scrollbar (tab, visible_items, g.ui_vunit); app_compute_scrollbar (tab, app_visible_items_height (), g.ui_vunit);
XRenderFillRectangle (g.dpy, PictOpSrc, g.x11_pixmap_picture, XRenderFillRectangle (g.dpy, PictOpSrc, g.x11_pixmap_picture,
x11_fg_attrs (self->attrs), x11_fg_attrs (self->attrs),