From 9e2baee37da457c34da61fab3d9a93ce98da5654 Mon Sep 17 00:00:00 2001 From: Adrian Lees Date: Sun, 24 Jun 2007 17:10:08 +0000 Subject: Scroll wheel support on hotlist and history windows svn path=/trunk/netsurf/; revision=3364 --- !NetSurf/Resources/de/Templates,fec | Bin 18741 -> 18741 bytes !NetSurf/Resources/en/Templates,fec | Bin 18769 -> 18769 bytes !NetSurf/Resources/fr/Templates,fec | Bin 19158 -> 19158 bytes !NetSurf/Resources/nl/Templates,fec | Bin 18799 -> 18799 bytes riscos/window.c | 5 +---- 5 files changed, 1 insertion(+), 4 deletions(-) diff --git a/!NetSurf/Resources/de/Templates,fec b/!NetSurf/Resources/de/Templates,fec index bbd844051..f20497fdc 100755 Binary files a/!NetSurf/Resources/de/Templates,fec and b/!NetSurf/Resources/de/Templates,fec differ diff --git a/!NetSurf/Resources/en/Templates,fec b/!NetSurf/Resources/en/Templates,fec index 79c613fd3..a882fb854 100644 Binary files a/!NetSurf/Resources/en/Templates,fec and b/!NetSurf/Resources/en/Templates,fec differ diff --git a/!NetSurf/Resources/fr/Templates,fec b/!NetSurf/Resources/fr/Templates,fec index 15fee494e..95bb6c11e 100644 Binary files a/!NetSurf/Resources/fr/Templates,fec and b/!NetSurf/Resources/fr/Templates,fec differ diff --git a/!NetSurf/Resources/nl/Templates,fec b/!NetSurf/Resources/nl/Templates,fec index 18f83347d..fc2855879 100644 Binary files a/!NetSurf/Resources/nl/Templates,fec and b/!NetSurf/Resources/nl/Templates,fec differ diff --git a/riscos/window.c b/riscos/window.c index b2279b52f..2d9e8da58 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -2644,12 +2644,9 @@ void ro_gui_scroll_request(wimp_scroll *scroll) int x, y; struct gui_window *g = ro_gui_window_lookup(scroll->w); - if (!g) - return; - x = scroll->visible.x1 - scroll->visible.x0 - 32; y = scroll->visible.y1 - scroll->visible.y0 - 32; - if (g->toolbar) + if (g && g->toolbar) y -= ro_gui_theme_toolbar_full_height(g->toolbar); switch (scroll->xmin) { -- cgit v1.2.3