mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-25 07:49:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Take account of scrollbar-occupied regions.

Browse Source
This commit is contained in:
Michael Drake 2013-02-09 13:34:28 +00:00
parent f848de3dd0
commit 048b344a43
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
desktop/textarea.c
View File

@ -264,16 +264,18 @@ static bool textarea_scroll_visible(struct textarea *ta)
int xs = ta->scroll_x; int xs = ta->scroll_x;
int ys = ta->scroll_y; int ys = ta->scroll_y;
int vis; int vis;
int scrollbar_width;
bool scrolled = false; bool scrolled = false;
if (ta->caret_pos.char_off == -1) if (ta->caret_pos.char_off == -1)
return false; return false;
scrollbar_width = (ta->bar_y == NULL) ? 0 : SCROLLBAR_WIDTH;
x0 = ta->border_width + ta->pad_left; x0 = ta->border_width + ta->pad_left;
x1 = ta->vis_width - (ta->border_width + ta->pad_right); x1 = ta->vis_width - (ta->border_width + ta->pad_right);
/* Adjust scroll pos for reduced extents */ /* Adjust scroll pos for reduced extents */
vis = ta->vis_width - 2 * ta->border_width; vis = ta->vis_width - 2 * ta->border_width - scrollbar_width;
if (ta->h_extent - xs < vis) if (ta->h_extent - xs < vis)
xs -= vis - (ta->h_extent - xs); xs -= vis - (ta->h_extent - xs);
@ -311,12 +313,13 @@ static bool textarea_scroll_visible(struct textarea *ta)
/* check and change vertical scroll */ /* check and change vertical scroll */
if (ta->flags & TEXTAREA_MULTILINE) { if (ta->flags & TEXTAREA_MULTILINE) {
scrollbar_width = (ta->bar_x == NULL) ? 0 : SCROLLBAR_WIDTH;
y0 = 0; y0 = 0;
y1 = ta->vis_height - 2 * ta->border_width - y1 = ta->vis_height - 2 * ta->border_width -
ta->pad_top - ta->pad_bottom; ta->pad_top - ta->pad_bottom;
/* Adjust scroll pos for reduced extents */ /* Adjust scroll pos for reduced extents */
vis = ta->vis_height - 2 * ta->border_width; vis = ta->vis_height - 2 * ta->border_width - scrollbar_width;
if (ta->v_extent - ys < vis) if (ta->v_extent - ys < vis)
ys -= vis - (ta->v_extent - ys); ys -= vis - (ta->v_extent - ys);