#include <modest-tny-msg.h>
#include <modest-text-utils.h>
#include <widgets/modest-msg-view.h>
-#include <widgets/modest-mail-header-view.h>
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <widgets/modest-compact-mail-header-view.h>
+#include <hildon/hildon-gtk.h>
+#else
+#include <widgets/modest-expander-mail-header-view.h>
+#endif
#include <widgets/modest-attachments-view.h>
#include <modest-marshal.h>
#include <widgets/modest-gtkhtml-mime-part-view.h>
#include <widgets/modest-ui-constants.h>
/* FIXNE: we should have no maemo-deps in widgets/ */
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
#include "maemo/modest-hildon-includes.h"
-#endif /*MODEST_PLATFORM_MAEMO*/
+#endif /*!MODEST_TOOLKIT_GTK*/
/* 'private'/'protected' functions */
/* headers signals */
static void on_recpt_activated (ModestMailHeaderView *header_view, const gchar *address, ModestGtkhtmlMsgView *msg_view);
+static void on_show_details (ModestMailHeaderView *header_view, ModestGtkhtmlMsgView *msg_view);
static void on_attachment_activated (ModestAttachmentsView * att_view, TnyMimePart *mime_part, gpointer userdata);
static void on_view_images_clicked (GtkButton * button, gpointer self);
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);
GdkWindow *headers_window;
GdkWindow *html_window;
+ /* id handler for dragged scroll */
+ guint idle_motion_id;
+
/* zoom */
gdouble current_zoom;
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");
priv->msg = NULL;
priv->body_view = GTK_WIDGET (g_object_new (MODEST_TYPE_GTKHTML_MIME_PART_VIEW, NULL));
- priv->mail_header_view = GTK_WIDGET(modest_mail_header_view_new (TRUE));
+#ifdef MODEST_TOOLKIT_HILDON2
+ priv->mail_header_view = GTK_WIDGET(modest_compact_mail_header_view_new ());
+#else
+ priv->mail_header_view = GTK_WIDGET(modest_expander_mail_header_view_new (TRUE));
+#endif
priv->view_images_button = gtk_button_new_with_label (_("mail_bd_external_images"));
+#ifdef MODEST_TOOLKIT_HILDON2
+ hildon_gtk_widget_set_theme_size (priv->view_images_button,
+ HILDON_SIZE_HALFSCREEN_WIDTH | HILDON_SIZE_FINGER_HEIGHT);
+#endif
gtk_widget_set_no_show_all (priv->mail_header_view, TRUE);
gtk_widget_set_no_show_all (priv->view_images_button, TRUE);
priv->attachments_view = GTK_WIDGET(modest_attachments_view_new (NULL));
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);
+ g_signal_connect (G_OBJECT (priv->mail_header_view), "show-details",
+ G_CALLBACK (on_show_details), obj);
g_signal_connect (G_OBJECT (priv->attachments_view), "activate",
G_CALLBACK (on_attachment_activated), obj);
hbuttonbox = gtk_hbutton_box_new ();
gtk_container_add (GTK_CONTAINER (hbuttonbox), priv->view_images_button);
+#ifdef MODEST_TOOLKIT_HILDON2
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_START);
+ gtk_box_pack_start (GTK_BOX (priv->headers_box), hbuttonbox, TRUE, TRUE, 0);
+#else
gtk_box_pack_start (GTK_BOX (priv->headers_box), hbuttonbox, FALSE, FALSE, 0);
+#endif
gtk_widget_hide (priv->view_images_button);
}
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 */
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)
{
}
static void
+on_show_details (ModestMailHeaderView *header_view,
+ ModestGtkhtmlMsgView *self)
+{
+ g_signal_emit_by_name (G_OBJECT (self), "show-details");
+}
+
+static void
on_attachment_activated (ModestAttachmentsView * att_view, TnyMimePart *mime_part, gpointer self)
{
projects / modest / blobdiff