X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-msg-view.c;h=de775b17389b6caf9c01afaf7b205fa5b208b277;hp=fadf40260ae3260bd8b959a0947945e022d18d61;hb=f2f85fb554572fa18695ab7b60c6143347c92d92;hpb=868b4ce7dd7628d47d8fe7eac7a47c13406abc56

diff --git a/src/widgets/modest-msg-view.c b/src/widgets/modest-msg-view.c
index fadf402..de775b1 100644
--- a/src/widgets/modest-msg-view.c
+++ b/src/widgets/modest-msg-view.c
@@ -86,6 +86,7 @@ static void adjustment_value_changed (GtkAdjustment *adj, gpointer data);
 static void html_adjustment_changed (GtkAdjustment *adj, gpointer data);
 static void disconnect_vadjustment (ModestMsgView *obj);
 static void disconnect_hadjustment (ModestMsgView *obj);
+static gboolean idle_readjust_scroll (ModestMsgView *obj);
 
 /* GtkContainer methods */
 static void forall (GtkContainer *container, gboolean include_internals,
@@ -830,7 +831,11 @@ html_adjustment_changed (GtkAdjustment *adj,
 	gboolean vadj_changed;
 	gint new_height;
 
+	g_signal_stop_emission_by_name (G_OBJECT (adj), "changed");
+
 	priv->html_scroll->requisition.height = html_vadj->upper;
+	if (html_vadj->upper == priv->html_scroll->allocation.height)
+		return;
 	priv->html_scroll->allocation.height = html_vadj->upper;
 
 	set_vadjustment_values (msg_view, &vadj_changed);
@@ -1335,6 +1340,7 @@ modest_msg_view_set_message (ModestMsgView *self, TnyMsg *msg)
 	TnyMimePart *body;
 	ModestMsgViewPrivate *priv;
 	TnyHeader *header;
+	GtkAdjustment *html_vadj;
 	
 	g_return_if_fail (self);
 	
@@ -1405,6 +1411,15 @@ modest_msg_view_set_message (ModestMsgView *self, TnyMsg *msg)
 	if (priv->vadj != NULL)
 		priv->vadj->value = 0.0;
 
+	html_vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
+
+	g_signal_emit_by_name (G_OBJECT (html_vadj), "changed");
+
+	/* This is a hack to force reallocation of scroll after drawing all the stuff. This
+	 * makes the html view get the proper and expected size and prevent being able to scroll
+	 * the buffer when it shouldn't be scrollable */
+	g_object_ref (self);
+	g_timeout_add (250, (GSourceFunc) idle_readjust_scroll, self);
 }
 
 
@@ -1628,3 +1643,19 @@ modest_msg_view_remove_attachment (ModestMsgView *view, TnyMimePart *attachment)
 						   attachment);
 	
 }
+
+gboolean
+idle_readjust_scroll (ModestMsgView *view)
+{
+	if (GTK_WIDGET_DRAWABLE (view)) {
+		ModestMsgViewPrivate *priv = MODEST_MSG_VIEW_GET_PRIVATE (view);
+		GtkAdjustment *html_vadj;
+		html_vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
+		html_vadj->page_size = html_vadj->upper;
+		gtk_adjustment_changed (html_vadj);
+		gtk_widget_queue_resize (GTK_WIDGET (view));
+		gtk_widget_queue_draw (GTK_WIDGET (view));
+	}
+	g_object_unref (G_OBJECT (view));
+	return FALSE;
+}