mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-19 18:52:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

gtk/corewindow.c: Correctly handle scroll_visible

Browse Source 
Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
This commit is contained in:
Daniel Silverstone 2019-08-02 21:00:06 +01:00
parent 818f4018d2
commit c078c3f509
1 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
frontends/gtk/corewindow.c
View File

@ -608,26 +608,52 @@ static void
nsgtk_cw_scroll_visible(struct core_window *cw, const struct rect *r)
{
struct nsgtk_corewindow *nsgtk_cw = (struct nsgtk_corewindow *)cw;
int y = 0, height = 0, y0, y1;
gdouble page;
int x0, y0, x1, y1;
gdouble vpage, hpage;
GtkAdjustment *vadj;
GtkAdjustment *hadj;
vadj = gtk_scrolled_window_get_vadjustment(nsgtk_cw->scrolled);
hadj = gtk_scrolled_window_get_hadjustment(nsgtk_cw->scrolled);
assert(vadj);
assert(vadj != NULL);
assert(hadj != NULL);
g_object_get(vadj, "page-size", &page, NULL);
g_object_get(vadj, "page-size", &vpage, NULL);
g_object_get(hadj, "page-size", &hpage, NULL);
y0 = (int)(gtk_adjustment_get_value(vadj));
y1 = y0 + page;
y1 = y0 + vpage;
x0 = (int)(gtk_adjustment_get_value(hadj));
x1 = x0 + hpage;
if (r->y1 > y1) {
/* The bottom of the rectangle is off the bottom of the
* window, so scroll down to fit it
*/
y0 = r->y1 - vpage;
}
if (r->y0 < y0) {
/* The top of the rectangle is off the top of the window,
* so scroll up to fit it
*/
y0 = r->y0;
}
if (r->x1 > x1) {
/* The right of the rectangle is off the right of the window
* so scroll right to fit it
*/
x0 = r->x1 - hpage;
}
if (r->x0 < x0) {
/* The left of the rectangle is off the left of the window
* so scroll left to fit it
*/
x0 = r->x0;
}
if ((y >= y0) && (y + height <= y1))
return;
if (y + height > y1)
y0 = y0 + (y + height - y1);
if (y < y0)
y0 = y;
gtk_adjustment_set_value(vadj, y0);
gtk_adjustment_set_value(hadj, x0);
}