* src/modest-marshal.list:

[modest] / src / widgets / modest-gtkhtml-msg-view.c

diff --git a/src/widgets/modest-gtkhtml-msg-view.c b/src/widgets/modest-gtkhtml-msg-view.c
index ef7ee44..3bacb9b 100644 (file)
--- a/src/widgets/modest-gtkhtml-msg-view.c
+++ b/src/widgets/modest-gtkhtml-msg-view.c
@@ -82,6 +82,7 @@ static gboolean on_link_hover (GtkWidget *widget, const gchar *uri, ModestGtkhtm
 
 #ifdef MAEMO_CHANGES
 static void     on_tap_and_hold (GtkWidget *widget, gpointer userdata); 
+static gboolean on_tap_and_hold_query (GtkWidget *widget, GdkEvent *event, gpointer userdata); 
 #endif /*MAEMO_CHANGES*/
 
 
@@ -108,6 +109,15 @@ static gboolean motion_notify_event (GtkWidget *widget,
                                     gpointer userdata);
 #endif
 
+static gboolean 
+button_press_event (GtkWidget *widget,
+                   GdkEventButton *event,
+                   gpointer userdata);
+static gboolean 
+button_release_event (GtkWidget *widget,
+                     GdkEventButton *event,
+                     gpointer userdata);
+
 /* GtkContainer methods */
 static void forall (GtkContainer *container, gboolean include_internals,
                    GtkCallback callback, gpointer userdata);
@@ -228,6 +238,9 @@ struct _ModestGtkhtmlMsgViewPrivate {
        GdkWindow *headers_window;
        GdkWindow *html_window;
 
+       /* id handler for dragged scroll */
+       guint idle_motion_id;
+
        /* zoom */
        gdouble current_zoom;
 
@@ -1034,6 +1047,8 @@ modest_gtkhtml_msg_view_init (ModestGtkhtmlMsgView *obj)
        priv->headers_window = NULL;
        priv->html_window = NULL;
 
+       priv->idle_motion_id = 0;
+
        gtk_widget_push_composite_child ();
        priv->html_scroll = gtk_scrolled_window_new (NULL, NULL);
        gtk_widget_set_composite_name (priv->html_scroll, "contents");
@@ -1059,6 +1074,10 @@ modest_gtkhtml_msg_view_init (ModestGtkhtmlMsgView *obj)
        g_signal_connect (G_OBJECT(priv->body_view), "motion-notify-event",
                          G_CALLBACK (motion_notify_event), obj);
 #endif
+       g_signal_connect (G_OBJECT (priv->body_view), "button-press-event",
+                         G_CALLBACK (button_press_event), obj);
+       g_signal_connect (G_OBJECT (priv->body_view), "button-release-event",
+                         G_CALLBACK (button_release_event), obj);
 
        g_signal_connect (G_OBJECT (priv->mail_header_view), "recpt-activated", 
                          G_CALLBACK (on_recpt_activated), obj);
@@ -1113,6 +1132,7 @@ modest_gtkhtml_msg_view_init (ModestGtkhtmlMsgView *obj)
 #ifdef MAEMO_CHANGES
                gtk_widget_tap_and_hold_setup (GTK_WIDGET (priv->body_view), NULL, NULL, 0);
                g_signal_connect (G_OBJECT (priv->body_view), "tap-and-hold", G_CALLBACK (on_tap_and_hold), obj);
+               g_signal_connect (G_OBJECT (priv->body_view), "tap-and-hold-query", G_CALLBACK (on_tap_and_hold_query), obj);
 #endif
        }
        
@@ -1129,6 +1149,11 @@ modest_gtkhtml_msg_view_finalize (GObject *obj)
                g_object_unref (G_OBJECT(priv->msg));
                priv->msg = NULL;
        }
+
+       if (priv->idle_motion_id > 0) {
+               g_source_remove (priv->idle_motion_id);
+               priv->idle_motion_id = 0;
+       }
        
        /* we cannot disconnect sigs, because priv->body_view is
         * already dead */
@@ -1177,11 +1202,63 @@ motion_notify_event (GtkWidget *widget,
                        value = priv->vadj->upper - priv->vadj->page_size;
                gtk_adjustment_set_value (priv->vadj, value);
                
-       }
+       } 
        return FALSE;
 }
 #endif
 
+static gboolean
+idle_motion (gpointer userdata)
+{
+       ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (userdata);
+       if (GTK_HTML (priv->body_view)->in_selection_drag) {
+               gdouble offset;
+               GtkAdjustment *adj;
+               gint gdk_y;
+               gdk_window_get_pointer (gtk_widget_get_parent_window (priv->body_view), NULL, &gdk_y, NULL);
+               offset= (gdouble) (priv->headers_box->requisition.height + gdk_y);
+               adj = GTK_ADJUSTMENT (priv->vadj);
+               if (offset < adj->value + adj->step_increment) {
+                       gtk_adjustment_set_value (adj, MAX (offset + adj->page_increment - adj->page_size, 0.0));
+               } else if (offset > adj->value + adj->page_increment) {
+                       gtk_adjustment_set_value (adj, MIN (offset - adj->page_increment, adj->upper - adj->page_size));
+               }
+               gtk_widget_queue_resize (userdata);
+       }
+       return TRUE;
+}
+
+static gboolean 
+button_press_event (GtkWidget *widget,
+                   GdkEventButton *event,
+                   gpointer userdata)
+{
+       ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (userdata);
+
+       if (priv->idle_motion_id == 0) {
+               priv->idle_motion_id = g_timeout_add (200, idle_motion, userdata);
+       }
+       return FALSE;
+}
+
+static gboolean 
+button_release_event (GtkWidget *widget,
+                     GdkEventButton *event,
+                     gpointer userdata)
+{
+       ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (userdata);
+
+       if (priv->idle_motion_id > 0) {
+               gint gdk_y;
+               g_source_remove (priv->idle_motion_id);
+               
+               priv->idle_motion_id = 0;;
+               gdk_window_get_pointer (gtk_widget_get_parent_window (priv->body_view), NULL, &gdk_y, NULL);
+               event->y = (gdouble) gdk_y;
+       }
+       return FALSE;
+}
+
 static GtkAdjustment *
 get_vadjustment (ModestGtkhtmlMsgView *self)
 {
@@ -1317,6 +1394,18 @@ on_tap_and_hold (GtkWidget *widget,
 
        g_signal_emit_by_name (G_OBJECT (self), "link-contextual", priv->last_url);
 }
+
+static gboolean
+on_tap_and_hold_query (GtkWidget *widget,
+                      GdkEvent *event,
+                      gpointer data)
+{
+       ModestGtkhtmlMsgView *self = (ModestGtkhtmlMsgView *) data;
+       ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
+
+       /* Don't show the tap and hold animation if no url below */
+       return (priv->last_url == NULL);
+}
 #endif
 
 static void
@@ -1551,6 +1640,7 @@ set_message (ModestGtkhtmlMsgView *self, TnyMsg *msg)
        body = modest_tny_msg_find_body_part (msg, TRUE);
        if (body) {
                tny_mime_part_view_set_part (TNY_MIME_PART_VIEW (priv->body_view), body);
+               g_object_unref (body);
 
                if(modest_attachments_view_has_attachments (MODEST_ATTACHMENTS_VIEW (priv->attachments_view))) {
                        gtk_widget_show_all (priv->attachments_box);