From 13afa0ff4c591e7800dc4c11a81d04c335418c05 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Fri, 14 Aug 2009 10:37:33 +0000 Subject: Merge Paul Blokus' selectscroll branch. Adds core select menu widget for forms and core scrollbar widget. svn path=/trunk/netsurf/; revision=9289 --- framebuffer/gui.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'framebuffer/gui.c') diff --git a/framebuffer/gui.c b/framebuffer/gui.c index fbed5bd86..c6aaa8f49 100644 --- a/framebuffer/gui.c +++ b/framebuffer/gui.c @@ -41,6 +41,7 @@ #include "utils/messages.h" #include "utils/utils.h" #include "desktop/textinput.h" +#include "render/form.h" #include "framebuffer/gui.h" #include "framebuffer/fbtk.h" @@ -292,13 +293,14 @@ static void fb_redraw(fbtk_widget_t *widget, nsfb_claim(fbtk_get_nsfb(widget), &bwidget->redraw_box); /* redraw bounding box is relative to window */ + current_redraw_browser = bw; content_redraw(c, x - bwidget->scrollx, y - bwidget->scrolly, width, height, bwidget->redraw_box.x0, bwidget->redraw_box.y0, bwidget->redraw_box.x1, bwidget->redraw_box.y1, bw->scale, 0xFFFFFF); - + current_redraw_browser = NULL; nsfb_release(fbtk_get_nsfb(widget), &bwidget->redraw_box); @@ -357,6 +359,8 @@ void gui_init(int argc, char** argv) LOG(("Using '%s' as Messages file", buf)); messages_load(buf); + option_core_select_menu = true; + /* load browser options */ fb_find_resource(buf, "Choices-fb", "~/.netsurf/Choices-fb"); LOG(("Using '%s' as Preferences file", buf)); -- cgit v1.2.3