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
This commit is contained in:
Daniel Silverstone 2007-06-18 18:48:37 +00:00
parent 36ecbc6be2
commit 7d75762004
2 changed files with 2 additions and 4 deletions

View File

@ -773,8 +773,6 @@ void gui_window_stop_throbber(struct gui_window* _g)
schedule_remove(nsgtk_throb, g); schedule_remove(nsgtk_throb, g);
gtk_image_set_from_pixbuf(g->throbber, nsgtk_throbber->framedata[0]); 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) gboolean nsgtk_scaffolding_is_busy(nsgtk_scaffolding *scaffold)

View File

@ -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, void gui_window_get_dimensions(struct gui_window *g, int *width, int *height,
bool scaled) bool scaled)
{ {
*width = GTK_WIDGET(g->drawing_area)->allocation.width; *width = GTK_WIDGET(g->viewport)->allocation.width;
*height = GTK_WIDGET(g->drawing_area)->allocation.height; *height = GTK_WIDGET(g->viewport)->allocation.height;
if (scaled) { if (scaled) {
*width /= g->scale; *width /= g->scale;