From 5a4c8916efe2449f2cf43bef2f7746dd53469046 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Fri, 24 Jun 2011 09:30:33 +0000 Subject: If iframes are reformatted due to containing document reflow, don't need to redraw them since they will be redrawn when the containing document is redrawn. Make iframe handling more robust. svn path=/trunk/netsurf/; revision=12497 --- windows/drawable.c | 2 +- windows/gui.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'windows') diff --git a/windows/drawable.c b/windows/drawable.c index 0082da91b..37f735ee3 100644 --- a/windows/drawable.c +++ b/windows/drawable.c @@ -203,7 +203,7 @@ nsws_drawable_hscroll(struct gui_window *gw, HWND hwnd, WPARAM wparam) static LRESULT nsws_drawable_resize(struct gui_window *gw) { - browser_window_reformat(gw->bw, gw->width, gw->height); + browser_window_reformat(gw->bw, false, gw->width, gw->height); return 0; } diff --git a/windows/gui.c b/windows/gui.c index 5c5fed48a..21783d748 100644 --- a/windows/gui.c +++ b/windows/gui.c @@ -858,7 +858,7 @@ nsws_window_command(HWND hwnd, gui_window_get_scroll(gw, &x, &y); if (gw->bw != NULL) { browser_window_set_scale(gw->bw, gw->bw->scale * 1.1, true); - browser_window_reformat(gw->bw, gw->width, gw->height); + browser_window_reformat(gw->bw, false, gw->width, gw->height); } gui_window_redraw_window(gw); gui_window_set_scroll(gw, x, y); @@ -871,7 +871,7 @@ nsws_window_command(HWND hwnd, if (gw->bw != NULL) { browser_window_set_scale(gw->bw, gw->bw->scale * 0.9, true); - browser_window_reformat(gw->bw, gw->width, gw->height); + browser_window_reformat(gw->bw, false, gw->width, gw->height); } gui_window_redraw_window(gw); gui_window_set_scroll(gw, x, y); @@ -883,7 +883,7 @@ nsws_window_command(HWND hwnd, gui_window_get_scroll(gw, &x, &y); if (gw->bw != NULL) { browser_window_set_scale(gw->bw, 1.0, true); - browser_window_reformat(gw->bw, gw->width, gw->height); + browser_window_reformat(gw->bw, false, gw->width, gw->height); } gui_window_redraw_window(gw); gui_window_set_scroll(gw, x, y); @@ -948,7 +948,9 @@ nsws_window_command(HWND hwnd, case IDM_VIEW_TOGGLE_DEBUG_RENDERING: html_redraw_debug = !html_redraw_debug; if (gw->bw != NULL) { - browser_window_reformat(gw->bw, gw->width, gw->height); + /* TODO: This should only redraw, not reformat. + * (Layout doesn't change, so reformat is a waste of time) */ + browser_window_reformat(gw->bw, false, gw->width, gw->height); } break; -- cgit v1.2.3