* src/widgets/modest-gtkhtml-msg-view.c:

[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 4e8ef57..4532119 100644 (file)
--- a/src/widgets/modest-gtkhtml-msg-view.c
+++ b/src/widgets/modest-gtkhtml-msg-view.c
@@ -98,6 +98,13 @@ static void disconnect_vadjustment (ModestGtkhtmlMsgView *obj);
 static void disconnect_hadjustment (ModestGtkhtmlMsgView *obj);
 static gboolean idle_readjust_scroll (ModestGtkhtmlMsgView *obj);
 
 static void disconnect_hadjustment (ModestGtkhtmlMsgView *obj);
 static gboolean idle_readjust_scroll (ModestGtkhtmlMsgView *obj);
 

+/* vertical panning implementation */
+#ifdef MAEMO_CHANGES
+static gboolean motion_notify_event (GtkWidget *widget,
+                                    GdkEventMotion *event,
+                                    gpointer userdata);
+#endif
+

 /* GtkContainer methods */
 static void forall (GtkContainer *container, gboolean include_internals,
                    GtkCallback callback, gpointer userdata);
 /* GtkContainer methods */
 static void forall (GtkContainer *container, gboolean include_internals,
                    GtkCallback callback, gpointer userdata);

@@ -1043,6 +1050,10 @@ modest_gtkhtml_msg_view_init (ModestGtkhtmlMsgView *obj)
                                       G_CALLBACK(on_fetch_url), obj);
        g_signal_connect (G_OBJECT(priv->body_view), "link_hover",
                                       G_CALLBACK(on_link_hover), obj);
                                       G_CALLBACK(on_fetch_url), obj);
        g_signal_connect (G_OBJECT(priv->body_view), "link_hover",
                                       G_CALLBACK(on_link_hover), obj);

+#ifdef MAEMO_CHANGES
+       g_signal_connect (G_OBJECT(priv->body_view), "motion-notify-event",
+                         G_CALLBACK (motion_notify_event), obj);
+#endif

 
        g_signal_connect (G_OBJECT (priv->mail_header_view), "recpt-activated", 
                          G_CALLBACK (on_recpt_activated), obj);
 
        g_signal_connect (G_OBJECT (priv->mail_header_view), "recpt-activated", 
                          G_CALLBACK (on_recpt_activated), obj);

@@ -1126,6 +1137,35 @@ modest_gtkhtml_msg_view_destroy (GtkObject *obj)
 
 /* INTERNAL METHODS */
 
 
 /* INTERNAL METHODS */
 

+#ifdef MAEMO_CHANGES
+static gboolean 
+motion_notify_event (GtkWidget *widget,
+                    GdkEventMotion *event,
+                    gpointer userdata)
+{
+       ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (userdata);
+
+       /* Use panning information in gtkhtml widget to support also vertical panning */
+
+       if (GTK_HTML (widget)->panning) {
+               gint y, dy;
+               gdouble value;
+
+               gdk_window_get_pointer (GTK_LAYOUT (widget)->bin_window, NULL, &y, NULL);
+               dy = y - GTK_HTML (widget)->lasty;
+               value = priv->vadj->value - (gdouble) dy;
+
+               if (value < priv->vadj->lower)
+                       value = priv->vadj->lower;
+               else if (value > priv->vadj->upper - priv->vadj->page_size)
+                       value = priv->vadj->upper - priv->vadj->page_size;
+               gtk_adjustment_set_value (priv->vadj, value);
+               
+       }
+       return FALSE;
+}
+#endif
+

 static GtkAdjustment *
 get_vadjustment (ModestGtkhtmlMsgView *self)
 {
 static GtkAdjustment *
 get_vadjustment (ModestGtkhtmlMsgView *self)
 {

@@ -1689,12 +1729,12 @@ tny_msg_view_init (gpointer g, gpointer iface_data)
 {
        TnyMsgViewIface *klass = (TnyMsgViewIface *)g;
 
 {
        TnyMsgViewIface *klass = (TnyMsgViewIface *)g;
 

-       klass->get_msg_func = modest_msg_view_get_msg;
-       klass->set_msg_func = modest_msg_view_set_msg;
-       klass->set_unavailable_func = modest_msg_view_set_unavailable;
-       klass->clear_func = modest_msg_view_clear;
-       klass->create_mime_part_view_for_func = modest_msg_view_create_mime_part_view_for;
-       klass->create_new_inline_viewer_func = modest_msg_view_create_new_inline_viewer;
+       klass->get_msg = modest_msg_view_get_msg;
+       klass->set_msg = modest_msg_view_set_msg;
+       klass->set_unavailable = modest_msg_view_set_unavailable;
+       klass->clear = modest_msg_view_clear;
+       klass->create_mime_part_view_for = modest_msg_view_create_mime_part_view_for;
+       klass->create_new_inline_viewer = modest_msg_view_create_new_inline_viewer;

 
        return;
 }
 
        return;
 }

@@ -1786,9 +1826,9 @@ tny_mime_part_view_init (gpointer g, gpointer iface_data)
 {
        TnyMimePartViewIface *klass = (TnyMimePartViewIface *)g;
 
 {
        TnyMimePartViewIface *klass = (TnyMimePartViewIface *)g;
 

-       klass->get_part_func = modest_msg_view_mp_get_part;
-       klass->set_part_func = modest_msg_view_mp_set_part;
-       klass->clear_func = modest_msg_view_mp_clear;
+       klass->get_part = modest_msg_view_mp_get_part;
+       klass->set_part = modest_msg_view_mp_set_part;
+       klass->clear = modest_msg_view_mp_clear;

 
        return;
 }
 
        return;
 }

@@ -2117,4 +2157,3 @@ modest_gtkhtml_msg_view_remove_attachment_default (ModestMsgView *self, TnyMimeP
 {
        remove_attachment (MODEST_GTKHTML_MSG_VIEW (self), attachment);
 }
 {
        remove_attachment (MODEST_GTKHTML_MSG_VIEW (self), attachment);
 }

-