summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2011-11-29 17:47:29 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2011-11-29 17:47:29 +0000
commit4856a4c1fba73c5ae20723cc1e5f93f5b0bfbefc (patch)
tree1cbf2adc8328e6dd9429a7437e9f3eb290b9b466 /desktop
parent9a29f4b4fe7a0c402d61c25a234274e223c0c7d7 (diff)
downloadnetsurf-4856a4c1fba73c5ae20723cc1e5f93f5b0bfbefc.tar.gz
netsurf-4856a4c1fba73c5ae20723cc1e5f93f5b0bfbefc.tar.bz2
Pass scroll wheel action into contents. Handle scrolling of box scrollbars and iframes.
svn path=/trunk/netsurf/; revision=13200
Diffstat (limited to 'desktop')
-rw-r--r--desktop/browser.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/desktop/browser.c b/desktop/browser.c
index 124821ff2..80c84a16a 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -557,8 +557,11 @@ bool browser_window_scroll_at_point(struct browser_window *bw,
}
}
- /* TODO:
- * Pass scroll to content to try scrolling something at this point */
+ /* Try to scroll any current content */
+ if (bw->current_content != NULL && content_scroll_at_point(
+ bw->current_content, x, y, scrx, scry) == true)
+ /* Scroll handled by current content */
+ return true;
/* Try to scroll this window, if scroll not already handled */
if (handled_scroll == false) {