Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/643f217bacc7f8ec643abff5bbbd12c360293f18
...commit
http://git.netsurf-browser.org/netsurf.git/commit/643f217bacc7f8ec643abff5bbbd12c360293f18
...tree
http://git.netsurf-browser.org/netsurf.git/tree/643f217bacc7f8ec643abff5bbbd12c360293f18
The branch, dsilvers/scrolloffset has been updated
via 643f217bacc7f8ec643abff5bbbd12c360293f18 (commit)
from 2c36eb4e217cf2528c8cb6d120fb9a662f212376 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=643f217bacc7f8ec643abff5bbbd12c360293f18
commit 643f217bacc7f8ec643abff5bbbd12c360293f18
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
Rework browser_window_set_scroll() slightly to record new scroll offsets
diff --git a/desktop/browser.c b/desktop/browser.c
index c8768b9..0d7badb 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -602,18 +602,24 @@ static nserror
browser_window_set_scroll(struct browser_window *bw,
const struct rect *rect)
{
+ nserror ret = NSERROR_OK;
+
if (bw->window != NULL) {
- return guit->window->set_scroll(bw->window, rect);
+ ret = guit->window->set_scroll(bw->window, rect);
+ } else {
+ if (bw->scroll_x != NULL) {
+ scrollbar_set(bw->scroll_x, rect->x0, false);
+ }
+ if (bw->scroll_y != NULL) {
+ scrollbar_set(bw->scroll_y, rect->y0, false);
+ }
}
- if (bw->scroll_x != NULL) {
- scrollbar_set(bw->scroll_x, rect->x0, false);
- }
- if (bw->scroll_y != NULL) {
- scrollbar_set(bw->scroll_y, rect->y0, false);
- }
+ /* update the history entry with current scroll offsets */
+ if (ret == NSERROR_OK)
+ browser_window_history_update(bw, bw->current_content);
- return NSERROR_OK;
+ return ret;
}
/**
-----------------------------------------------------------------------
Summary of changes:
desktop/browser.c | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/desktop/browser.c b/desktop/browser.c
index c8768b9..0d7badb 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -602,18 +602,24 @@ static nserror
browser_window_set_scroll(struct browser_window *bw,
const struct rect *rect)
{
+ nserror ret = NSERROR_OK;
+
if (bw->window != NULL) {
- return guit->window->set_scroll(bw->window, rect);
+ ret = guit->window->set_scroll(bw->window, rect);
+ } else {
+ if (bw->scroll_x != NULL) {
+ scrollbar_set(bw->scroll_x, rect->x0, false);
+ }
+ if (bw->scroll_y != NULL) {
+ scrollbar_set(bw->scroll_y, rect->y0, false);
+ }
}
- if (bw->scroll_x != NULL) {
- scrollbar_set(bw->scroll_x, rect->x0, false);
- }
- if (bw->scroll_y != NULL) {
- scrollbar_set(bw->scroll_y, rect->y0, false);
- }
+ /* update the history entry with current scroll offsets */
+ if (ret == NSERROR_OK)
+ browser_window_history_update(bw, bw->current_content);
- return NSERROR_OK;
+ return ret;
}
/**
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
