static gboolean on_fetch_url (GtkWidget *widget, const gchar *uri, TnyStream *stream,
ModestGtkhtmlMsgView *msg_view);
static gboolean on_link_hover (GtkWidget *widget, const gchar *uri, ModestGtkhtmlMsgView *msg_view);
+static void on_limit_error (GtkWidget *widget, ModestGtkhtmlMsgView *msg_view);
#ifdef MAEMO_CHANGES
static void on_tap_and_hold (GtkWidget *widget, gpointer userdata);
/* id handler for dragged scroll */
guint idle_motion_id;
+ /* idle changes count */
+ gint idle_changes_count;
+ guint idle_readjust_scroll_id;
+ guint idle_resize_children_id;
+
/* zoom */
gdouble current_zoom;
{
GtkAllocation view_allocation;
GtkAdjustment *hadj = get_hadjustment (self);
+ gint full_width = 0;
+ ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
get_view_allocation (self, &view_allocation);
hadj->page_size = view_allocation.width;
hadj->lower = 0;
hadj->upper = view_allocation.width;
+ /* Get the real width of the embedded html */
+ if (priv->html_scroll && GTK_WIDGET_VISIBLE(priv->html_scroll)) {
+ GtkAdjustment *html_hadj;
+ html_hadj = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
+ full_width += html_hadj->upper;
+ }
+
+ hadj->upper = MAX (view_allocation.width, full_width);
+
reclamp_adjustment (hadj, value_changed);
}
-static void
+static void
set_vadjustment_values (ModestGtkhtmlMsgView *self,
gboolean *value_changed)
{
allocation->height != widget->allocation.height))
gdk_window_invalidate_rect (widget->window, NULL, FALSE);
+ if (priv->idle_readjust_scroll_id == 0 && priv->idle_changes_count < 5 && widget->allocation.width != allocation->width) {
+ g_object_ref (self);
+ priv->idle_readjust_scroll_id = g_idle_add ((GSourceFunc) idle_readjust_scroll, self);
+ priv->idle_changes_count ++;
+ }
+
widget->allocation = *allocation;
set_hadjustment_values (self, &hadj_value_changed);
set_vadjustment_values (self, &vadj_value_changed);
}
}
+static gboolean
+resize_children_idle (GtkContainer *cont)
+{
+ ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (cont);
+ if (GTK_WIDGET_DRAWABLE (cont)) {
+ gtk_container_resize_children (cont);
+ }
+ priv->idle_resize_children_id = 0;
+
+ return FALSE;
+}
+
static void
html_adjustment_changed (GtkAdjustment *adj,
gpointer userdata)
if (GTK_WIDGET_DRAWABLE (priv->html_scroll)) {
gdk_window_resize (priv->html_window, (gint) priv->hadj->upper, (gint) new_height);
gdk_window_process_updates (priv->view_window, TRUE);
- gtk_container_resize_children (GTK_CONTAINER (self));
+ if (priv->idle_resize_children_id == 0)
+ priv->idle_resize_children_id = gdk_threads_add_idle ((GSourceFunc) resize_children_idle, self);
}
}
gboolean
idle_readjust_scroll (ModestGtkhtmlMsgView *self)
{
+ ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
/* We're out the main lock */
gdk_threads_enter ();
if (GTK_WIDGET_DRAWABLE (self)) {
- ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
GtkAdjustment *html_vadj;
+ GtkAdjustment *html_hadj;
+
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 (self));
- gtk_widget_queue_draw (GTK_WIDGET (self));
+ html_vadj->upper = 0;
+ html_vadj->page_size = 0;
+ g_signal_emit_by_name (G_OBJECT (html_vadj), "changed");
+
+ html_hadj = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
+ html_hadj->upper = 0;
+ html_hadj->page_size = 0;
+ g_signal_emit_by_name (G_OBJECT (html_hadj), "changed");
+
+ gtk_widget_set_size_request (GTK_WIDGET (priv->body_view), 1, 1);
+ gtk_widget_set_size_request (GTK_WIDGET (priv->body_view), -1, -1);
+
+ gtk_widget_queue_resize (GTK_WIDGET (priv->body_view));
+ gtk_widget_queue_draw (GTK_WIDGET (priv->body_view));
/* Just another hack for making readjust really work. This forces an update
* of the scroll, and then, make the scroll really update properly the
* the size and not corrupt scrollable area */
gtk_adjustment_set_value (priv->vadj, 1.0);
gtk_adjustment_set_value (priv->vadj, 0.0);
+
}
+ priv->idle_readjust_scroll_id = 0;
g_object_unref (G_OBJECT (self));
+
gdk_threads_leave ();
return FALSE;
{
ModestGtkhtmlMsgViewPrivate *priv;
GtkAdjustment *html_vadj;
- GtkWidget *separator;
GTK_WIDGET_UNSET_FLAGS (obj, GTK_NO_WINDOW);
gtk_widget_set_redraw_on_allocate (GTK_WIDGET (obj), TRUE);
priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE(obj);
+ priv->idle_changes_count = 0;
+ priv->idle_readjust_scroll_id = 0;
+ priv->idle_resize_children_id = 0;
priv->current_zoom = 1.0;
priv->hadj = NULL;
G_CALLBACK(on_fetch_url), obj);
g_signal_connect (G_OBJECT(priv->body_view), "link_hover",
G_CALLBACK(on_link_hover), obj);
+ g_signal_connect (G_OBJECT(priv->body_view), "limit_error",
+ G_CALLBACK(on_limit_error), obj);
#ifdef MAEMO_CHANGES
g_signal_connect (G_OBJECT(priv->body_view), "motion-notify-event",
G_CALLBACK (motion_notify_event), obj);
g_free (att_label);
}
+#ifndef MODEST_TOOLKIT_HILDON2
separator = gtk_hseparator_new ();
gtk_box_pack_start (GTK_BOX(priv->headers_box), separator, FALSE, FALSE, 0);
+#endif
gtk_widget_set_parent (priv->headers_box, GTK_WIDGET (obj));
priv->msg = NULL;
}
+ if (priv->idle_resize_children_id > 0) {
+ g_source_remove (priv->idle_resize_children_id);
+ priv->idle_resize_children_id = 0;
+ }
+
+ if (priv->idle_readjust_scroll_id > 0) {
+ g_source_remove (priv->idle_readjust_scroll_id);
+ priv->idle_readjust_scroll_id = 0;
+ }
+
if (priv->idle_motion_id > 0) {
g_source_remove (priv->idle_motion_id);
priv->idle_motion_id = 0;
return result;
}
+static void
+on_limit_error (GtkWidget *widget, ModestGtkhtmlMsgView *msg_view)
+{
+ g_signal_emit_by_name (G_OBJECT (msg_view), "limit-error");
+}
static TnyMimePart *
TnyMimePart *body;
ModestGtkhtmlMsgViewPrivate *priv;
TnyHeader *header;
- GtkAdjustment *html_vadj;
+ GtkAdjustment *html_vadj, *html_hadj;
g_return_if_fail (self);
gtk_widget_set_no_show_all (priv->mail_header_view, FALSE);
modest_mime_part_view_set_view_images (MODEST_MIME_PART_VIEW (priv->body_view), FALSE);
- html_vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
- html_vadj->upper = 0;
- html_vadj->page_size = 0;
- g_signal_emit_by_name (G_OBJECT (html_vadj), "changed");
-
-
if (msg != priv->msg) {
if (priv->msg)
g_object_unref (G_OBJECT(priv->msg));
#endif
gtk_widget_set_no_show_all (priv->mail_header_view, TRUE);
tny_mime_part_view_clear (TNY_MIME_PART_VIEW (priv->body_view));
+
+ html_vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
+ html_vadj->upper = 0;
+ html_vadj->page_size = 0;
+ g_signal_emit_by_name (G_OBJECT (html_vadj), "changed");
+
+ html_hadj = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
+ html_hadj->upper = 0;
+ html_hadj->page_size = 0;
+ g_signal_emit_by_name (G_OBJECT (html_hadj), "changed");
+
+ gtk_widget_set_size_request (GTK_WIDGET (priv->body_view), 1, 1);
+ gtk_widget_set_size_request (GTK_WIDGET (priv->body_view), -1, -1);
+
+ priv->idle_changes_count = 0;
+ gtk_widget_queue_resize (GTK_WIDGET (priv->body_view));
+
gtk_widget_queue_resize (GTK_WIDGET(self));
gtk_widget_queue_draw (GTK_WIDGET(self));
return;
gtk_widget_set_no_show_all (priv->priority_box, FALSE);
#endif
gtk_widget_set_no_show_all (priv->mail_header_view, TRUE);
+
+ html_vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
+ html_vadj->upper = 0;
+ html_vadj->page_size = 0;
+ g_signal_emit_by_name (G_OBJECT (html_vadj), "changed");
+
+ html_hadj = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
+ html_hadj->upper = 0;
+ html_hadj->page_size = 0;
+ g_signal_emit_by_name (G_OBJECT (html_hadj), "changed");
+
+ gtk_widget_set_size_request (GTK_WIDGET (priv->body_view), 1, 1);
+ gtk_widget_set_size_request (GTK_WIDGET (priv->body_view), -1, -1);
+
+ priv->idle_changes_count = 0;
+ gtk_widget_queue_resize (GTK_WIDGET (priv->body_view));
+
gtk_widget_queue_resize (GTK_WIDGET(self));
gtk_widget_queue_draw (GTK_WIDGET(self));
/* 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);
+ if (priv->idle_readjust_scroll_id == 0) {
+ g_object_ref (self);
+ priv->idle_readjust_scroll_id = g_idle_add ((GSourceFunc) idle_readjust_scroll, self);
+ }
}
static void
set_header (ModestGtkhtmlMsgView *self, TnyHeader *header)
{
ModestGtkhtmlMsgViewPrivate *priv;
- GtkAdjustment *html_vadj;
+ GtkAdjustment *html_vadj, *html_hadj;
g_return_if_fail (self);
html_vadj->page_size = 0;
g_signal_emit_by_name (G_OBJECT (html_vadj), "changed");
+ html_hadj = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
+ html_hadj->upper = 0;
+ html_hadj->page_size = 0;
+ g_signal_emit_by_name (G_OBJECT (html_hadj), "changed");
+
+ priv->idle_changes_count = 0;
+ gtk_widget_set_size_request (GTK_WIDGET (priv->body_view), 1, 1);
+ gtk_widget_set_size_request (GTK_WIDGET (priv->body_view), -1, -1);
+ gtk_widget_queue_resize (GTK_WIDGET (priv->body_view));
if (priv->msg) {
g_object_unref (G_OBJECT(priv->msg));
#endif
gtk_widget_set_no_show_all (priv->mail_header_view, TRUE);
tny_mime_part_view_clear (TNY_MIME_PART_VIEW (priv->body_view));
+ priv->idle_changes_count = 0;
gtk_widget_queue_resize (GTK_WIDGET(self));
gtk_widget_queue_draw (GTK_WIDGET(self));
}
set_zoom (ModestGtkhtmlMsgView *self, gdouble zoom)
{
ModestGtkhtmlMsgViewPrivate *priv;
+ GtkAdjustment *html_vadj, *html_hadj;
g_return_if_fail (MODEST_IS_GTKHTML_MSG_VIEW (self));
priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
modest_zoomable_set_zoom (MODEST_ZOOMABLE(priv->body_view), zoom);
+ html_vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
+ html_vadj->upper = 0;
+ html_vadj->page_size = 0;
+ g_signal_emit_by_name (G_OBJECT (html_vadj), "changed");
+
+ html_hadj = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
+ html_hadj->upper = 0;
+ html_hadj->page_size = 0;
+ g_signal_emit_by_name (G_OBJECT (html_hadj), "changed");
+
+ gtk_widget_set_size_request (GTK_WIDGET (priv->body_view), 1, 1);
+ gtk_widget_set_size_request (GTK_WIDGET (priv->body_view), -1, -1);
+
+ priv->idle_changes_count = 0;
gtk_widget_queue_resize (priv->body_view);
}
projects / modest / blobdiff