From 7d757620040e6da335617545af7b9ee13a7d591c Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Mon, 18 Jun 2007 18:48:37 +0000 Subject: Read dimensions from viewport not drawing area. This causes renders to not go overheight. As a result, remove the scheduled callback for after throbbing. This means we don't get the white flash on GTK page completion. svn path=/trunk/netsurf/; revision=3352 --- gtk/gtk_scaffolding.c | 2 -- gtk/gtk_window.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'gtk') diff --git a/gtk/gtk_scaffolding.c b/gtk/gtk_scaffolding.c index 639584b04..f09e3b08c 100644 --- a/gtk/gtk_scaffolding.c +++ b/gtk/gtk_scaffolding.c @@ -773,8 +773,6 @@ void gui_window_stop_throbber(struct gui_window* _g) schedule_remove(nsgtk_throb, g); gtk_image_set_from_pixbuf(g->throbber, nsgtk_throbber->framedata[0]); - // Issue a final reflow so that the content object reports its size correctly - schedule(5, (gtk_callback)(nsgtk_window_reflow_content), _g); } gboolean nsgtk_scaffolding_is_busy(nsgtk_scaffolding *scaffold) diff --git a/gtk/gtk_window.c b/gtk/gtk_window.c index 317af10a0..a6b1141d2 100644 --- a/gtk/gtk_window.c +++ b/gtk/gtk_window.c @@ -825,8 +825,8 @@ bool gui_copy_to_clipboard(struct selection *s) void gui_window_get_dimensions(struct gui_window *g, int *width, int *height, bool scaled) { - *width = GTK_WIDGET(g->drawing_area)->allocation.width; - *height = GTK_WIDGET(g->drawing_area)->allocation.height; + *width = GTK_WIDGET(g->viewport)->allocation.width; + *height = GTK_WIDGET(g->viewport)->allocation.height; if (scaled) { *width /= g->scale; -- cgit v1.2.3