Author: MarkieB
Date: Tue Jul 21 06:49:12 2009
New Revision: 8645
URL: http://source.netsurf-browser.org?rev=8645&view=rev
Log:
tidy up scrolling
Modified:
branches/MarkieB/windows/windows/gui.c
Modified: branches/MarkieB/windows/windows/gui.c
URL:
http://source.netsurf-browser.org/branches/MarkieB/windows/windows/gui.c?rev=8645&r1=8644&r2=8645&view=diff
==============================================================================
--- branches/MarkieB/windows/windows/gui.c (original)
+++ branches/MarkieB/windows/windows/gui.c Tue Jul 21 06:49:12 2009
@@ -568,8 +568,8 @@
si.fMask = SIF_POS;
SetScrollInfo(hwnd, SB_HORZ, &si, TRUE);
GetScrollInfo(hwnd, SB_HORZ, &si);
- gui_window_set_scroll(w, w->scrollx + si.nPos - mem,
- w->scrolly);
+ gui_window_set_scroll(w, w->scrollx + w->requestscrollx +
+ si.nPos - mem, w->scrolly);
break;
}
case WM_VSCROLL:
@@ -616,10 +616,8 @@
si.fMask = SIF_POS;
SetScrollInfo(hwnd, SB_VERT, &si, TRUE);
GetScrollInfo(hwnd, SB_VERT, &si);
- if (mem != si.nPos) {
- gui_window_set_scroll(w, w->scrollx,
- w->scrolly + si.nPos - mem);
- }
+ gui_window_set_scroll(w, w->scrollx, w->scrolly +
+ w->requestscrolly + si.nPos - mem);
break;
}
case WM_CREATE:
@@ -1127,6 +1125,7 @@
void gui_window_set_scroll(struct gui_window *w, int sx, int sy)
{
+ nsws_window_clear_screen(w);
LOG(("set scroll %p %d %d", w, sx, sy));
w->requestscrollx = sx - w->scrollx;
w->requestscrolly = sy - w->scrolly;
_______________________________________________
netsurf-commits mailing list
netsurf-commits@netsurf-browser.org
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
