mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-17 09:42:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Clean up gui_window_get_scroll() to use core interface correctly.

Browse Source 
Avoids trampling through internal core data structures.
This commit is contained in:
Michael Drake 2014-05-15 12:55:57 +01:00
parent b76e4d40a8
commit a1ccc3312d
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
windows/gui.c
View File

@ -1484,16 +1484,18 @@ static bool gui_window_get_scroll(struct gui_window *w, int *sx, int *sy)
void gui_window_set_scroll(struct gui_window *w, int sx, int sy) void gui_window_set_scroll(struct gui_window *w, int sx, int sy)
{ {
SCROLLINFO si; SCROLLINFO si;
nserror err;
int height;
int width;
POINT p; POINT p;
if ((w == NULL) || if ((w == NULL) || (w->bw == NULL))
(w->bw == NULL) ||
(browser_window_has_content(bw) == false))
return; return;
/* limit scale range */ err = browser_window_get_extents(w->bw, true, &width, &height);
if (abs(w->bw->scale - 0.0) < 0.00001) if (err != NSERROR_OK) {
w->bw->scale = 1.0; return;
}
w->requestscrollx = sx - w->scrollx; w->requestscrollx = sx - w->scrollx;
w->requestscrolly = sy - w->scrolly; w->requestscrolly = sy - w->scrolly;
@ -1502,10 +1504,10 @@ void gui_window_set_scroll(struct gui_window *w, int sx, int sy)
si.cbSize = sizeof(si); si.cbSize = sizeof(si);
si.fMask = SIF_ALL; si.fMask = SIF_ALL;
si.nMin = 0; si.nMin = 0;
si.nMax = (content_get_height(w->bw->current_content) * w->bw->scale) - 1; si.nMax = height - 1;
si.nPage = w->height; si.nPage = w->height;
si.nPos = max(w->scrolly + w->requestscrolly, 0); si.nPos = max(w->scrolly + w->requestscrolly, 0);
si.nPos = min(si.nPos, content_get_height(w->bw->current_content) * w->bw->scale - w->height); si.nPos = min(si.nPos, height - w->height);
SetScrollInfo(w->drawingarea, SB_VERT, &si, TRUE); SetScrollInfo(w->drawingarea, SB_VERT, &si, TRUE);
LOG(("SetScrollInfo VERT min:%d max:%d page:%d pos:%d", si.nMin, si.nMax, si.nPage, si.nPos)); LOG(("SetScrollInfo VERT min:%d max:%d page:%d pos:%d", si.nMin, si.nMax, si.nPage, si.nPos));
@ -1513,10 +1515,10 @@ void gui_window_set_scroll(struct gui_window *w, int sx, int sy)
si.cbSize = sizeof(si); si.cbSize = sizeof(si);
si.fMask = SIF_ALL; si.fMask = SIF_ALL;
si.nMin = 0; si.nMin = 0;
si.nMax = (content_get_width(w->bw->current_content) * w->bw->scale) -1; si.nMax = width -1;
si.nPage = w->width; si.nPage = w->width;
si.nPos = max(w->scrollx + w->requestscrollx, 0); si.nPos = max(w->scrollx + w->requestscrollx, 0);
si.nPos = min(si.nPos, content_get_width(w->bw->current_content) * w->bw->scale - w->width); si.nPos = min(si.nPos, width - w->width);
SetScrollInfo(w->drawingarea, SB_HORZ, &si, TRUE); SetScrollInfo(w->drawingarea, SB_HORZ, &si, TRUE);
LOG(("SetScrollInfo HORZ min:%d max:%d page:%d pos:%d", si.nMin, si.nMax, si.nPage, si.nPos)); LOG(("SetScrollInfo HORZ min:%d max:%d page:%d pos:%d", si.nMin, si.nMax, si.nPage, si.nPos));