* src/widgets/modest-recpt-view.c:

	* Put definitions of static functions at the start of the file.
* src/widgets/modest-msg-view.[ch]:
	* Added support for showing shadows (methods
	  (get|set)_shadow_type).
	* Added (get|set)_property implementation.
* src/widgets/modest-scroll-text.c
	* Now the scroll text embedded text view is shown as a label
	  (uses the bg color as base color).

pmo-trunk-r903

diff --git a/src/widgets/modest-msg-view.c b/src/widgets/modest-msg-view.c
index aae249c..221ab73 100644 (file)
--- a/src/widgets/modest-msg-view.c
+++ b/src/widgets/modest-msg-view.c
@@ -52,6 +52,8 @@ static void     modest_msg_view_class_init   (ModestMsgViewClass *klass);
 static void     modest_msg_view_init         (ModestMsgView *obj);
 static void     modest_msg_view_finalize     (GObject *obj);
 static void     modest_msg_view_destroy     (GtkObject *obj);
+static void     set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
+static void     get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
 
 /* headers signals */
 static void on_recpt_activated (ModestMailHeaderView *header_view, const gchar *address, ModestMsgView *msg_view);
@@ -92,6 +94,14 @@ enum {
        LAST_SIGNAL
 };
 
+/* list properties */
+enum {
+       PROP_0,
+       PROP_HADJUSTMENT,
+       PROP_VADJUSTMENT,
+       PROP_SHADOW_TYPE
+};
+
 typedef struct _ModestMsgViewPrivate ModestMsgViewPrivate;
 struct _ModestMsgViewPrivate {
        GtkWidget   *gtkhtml;
@@ -107,6 +117,7 @@ struct _ModestMsgViewPrivate {
        /* internal adjustments for set_scroll_adjustments */
        GtkAdjustment *hadj;
        GtkAdjustment *vadj;
+       GtkShadowType shadow_type;
 
        /* gdk windows for drawing */
        GdkWindow *view_window;
@@ -162,6 +173,8 @@ modest_msg_view_class_init (ModestMsgViewClass *klass)
 
        parent_class            = g_type_class_peek_parent (klass);
        gobject_class->finalize = modest_msg_view_finalize;
+       gobject_class->set_property = set_property;
+       gobject_class->get_property = get_property;
        gtkobject_class->destroy = modest_msg_view_destroy;
 
        widget_class->realize = realize;
@@ -177,6 +190,31 @@ modest_msg_view_class_init (ModestMsgViewClass *klass)
 
        g_type_class_add_private (gobject_class, sizeof(ModestMsgViewPrivate));
 
+       g_object_class_install_property (gobject_class,
+                                        PROP_HADJUSTMENT,
+                                        g_param_spec_object ("hadjustment", 
+                                                             _("Horizontal adjustment"),
+                                                             _("GtkAdjustment with information of the horizontal visible position"),
+                                                             GTK_TYPE_ADJUSTMENT,
+                                                             G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+
+       g_object_class_install_property (gobject_class,
+                                        PROP_VADJUSTMENT,
+                                        g_param_spec_object ("vadjustment", 
+                                                             _("Vertical adjustment"),
+                                                             _("GtkAdjustment with information of the vertical visible position"),
+                                                             GTK_TYPE_ADJUSTMENT,
+                                                             G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+
+       g_object_class_install_property (gobject_class,
+                                        PROP_SHADOW_TYPE,
+                                        g_param_spec_enum ("shadow_type", 
+                                                           _("Shadow type"),
+                                                           _("Kind of shadow that's shown around the view"),
+                                                           GTK_TYPE_SHADOW_TYPE,
+                                                           GTK_SHADOW_IN,
+                                                           G_PARAM_READABLE | G_PARAM_WRITABLE ));
+
        signals[LINK_CLICKED_SIGNAL] =
                g_signal_new ("link_clicked",
                              G_TYPE_FROM_CLASS (gobject_class),
@@ -226,6 +264,55 @@ modest_msg_view_class_init (ModestMsgViewClass *klass)
 }
 
 static void
+set_property (GObject *object, 
+             guint prop_id, 
+             const GValue *value, 
+             GParamSpec *pspec)
+{
+       ModestMsgView *msg_view = MODEST_MSG_VIEW (object);
+
+       switch (prop_id) {
+       case PROP_HADJUSTMENT:
+               modest_msg_view_set_hadjustment (msg_view, g_value_get_object (value));
+               break;
+       case PROP_VADJUSTMENT:
+               modest_msg_view_set_vadjustment (msg_view, g_value_get_object (value));
+               break;
+       case PROP_SHADOW_TYPE:
+               modest_msg_view_set_shadow_type (msg_view, g_value_get_enum (value));
+               break;
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+               break;
+       }
+}
+
+static void
+get_property (GObject *object, 
+             guint prop_id, 
+             GValue *value, 
+             GParamSpec *pspec)
+{
+       ModestMsgView *msg_view = MODEST_MSG_VIEW (object);
+       ModestMsgViewPrivate *priv = MODEST_MSG_VIEW_GET_PRIVATE (msg_view);
+
+       switch (prop_id) {
+       case PROP_HADJUSTMENT:
+               g_value_set_object (value, priv->hadj);
+               break;
+       case PROP_VADJUSTMENT:
+               g_value_set_object (value, priv->vadj);
+               break;
+       case PROP_SHADOW_TYPE:
+               g_value_set_enum (value, priv->shadow_type);
+               break;
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+               break;
+       }
+}
+
+static void
 disconnect_hadjustment (ModestMsgView *msg_view)
 {
        ModestMsgViewPrivate *priv = MODEST_MSG_VIEW_GET_PRIVATE (msg_view);
@@ -254,12 +341,18 @@ get_view_allocation (ModestMsgView *msg_view, GtkAllocation *allocation)
 {
        /* This method gets the allocation of the widget in parent widget. It's the
           real position and size of the widget */
+       ModestMsgViewPrivate *priv = MODEST_MSG_VIEW_GET_PRIVATE (msg_view);
        
        allocation->x = 0;
        allocation->y = 0;
 
-       allocation->width = MAX (1, GTK_WIDGET (msg_view)->allocation.width);
-       allocation->height = MAX (1, GTK_WIDGET (msg_view)->allocation.height);
+       if (priv->shadow_type != GTK_SHADOW_NONE) {
+               allocation->x = GTK_WIDGET (msg_view)->style->xthickness;
+               allocation->y = GTK_WIDGET (msg_view)->style->ythickness;
+       }
+
+       allocation->width = MAX (1, (GTK_WIDGET (msg_view)->allocation.width) - allocation->x * 2);
+       allocation->height = MAX (1, (GTK_WIDGET (msg_view)->allocation.height) - allocation->y * 2);
 
 }
 
@@ -488,7 +581,7 @@ expose (GtkWidget *widget,
                priv = MODEST_MSG_VIEW_GET_PRIVATE (msg_view);
                if (event->window == widget->window) {
                        gtk_paint_shadow (widget->style, widget->window,
-                                         GTK_STATE_NORMAL, GTK_SHADOW_NONE,
+                                         GTK_STATE_NORMAL, priv->shadow_type,
                                          &event->area, widget, "msgview",
                                          0,0,-1,-1);
                } else if (event->window == priv->headers_window) {
@@ -577,6 +670,12 @@ size_allocate (GtkWidget *widget,
        GtkAllocation headers_allocation, html_allocation;
        GtkAdjustment *html_vadj;
 
+       if (GTK_WIDGET_MAPPED (widget) &&
+           priv->shadow_type != GTK_SHADOW_NONE && 
+           (allocation->width != widget->allocation.width ||
+            allocation->height != widget->allocation.height))
+               gdk_window_invalidate_rect (widget->window, NULL, FALSE);
+
        widget->allocation = *allocation;
        set_hadjustment_values (msg_view, &hadj_value_changed);
        set_vadjustment_values (msg_view, &vadj_value_changed);
@@ -734,6 +833,7 @@ modest_msg_view_init (ModestMsgView *obj)
 
        priv->hadj = NULL;
        priv->vadj = NULL;
+       priv->shadow_type = GTK_SHADOW_IN;
        priv->view_window = NULL;
        priv->headers_window = NULL;
        priv->html_window = NULL;
@@ -862,6 +962,8 @@ modest_msg_view_set_hadjustment (ModestMsgView *msg_view, GtkAdjustment *hadj)
                gtk_adjustment_value_changed (hadj);
        else
                adjustment_value_changed (hadj, msg_view);
+
+       g_object_notify (G_OBJECT (msg_view), "hadjustment");
 }
 
 void
@@ -889,6 +991,53 @@ modest_msg_view_set_vadjustment (ModestMsgView *msg_view, GtkAdjustment *vadj)
                gtk_adjustment_value_changed (vadj);
        else
                adjustment_value_changed (vadj, msg_view);
+
+       g_object_notify (G_OBJECT (msg_view), "vadjustment");
+}
+
+/** 
+ * modest_msg_view_set_shadow_type:
+ * @msg_view: a #ModestMsgView.
+ * @shadow_type: new shadow type.
+ *
+ * Sets a shadow type of the message view.
+ **/ 
+void
+modest_msg_view_set_shadow_type (ModestMsgView *msg_view,
+                                GtkShadowType shadow_type)
+{
+       ModestMsgViewPrivate *priv;
+       g_return_if_fail (MODEST_IS_MSG_VIEW (msg_view));
+
+       priv = MODEST_MSG_VIEW_GET_PRIVATE (msg_view);
+       
+       if (priv->shadow_type != shadow_type) {
+               priv->shadow_type = shadow_type;
+               
+               if (GTK_WIDGET_VISIBLE (msg_view)) {
+                       gtk_widget_size_allocate (GTK_WIDGET (msg_view), &(GTK_WIDGET (msg_view)->allocation));
+                       gtk_widget_queue_draw (GTK_WIDGET (msg_view));
+               }
+               g_object_notify (G_OBJECT (msg_view), "shadow-type");
+       }
+}
+
+/**
+ * modest_msg_view_get_shadow_type:
+ * @msg_view: a #ModestMsgView
+ *
+ * Gets the current shadow type of the #ModestMsgView.
+ *
+ * Return value: the shadow type 
+ **/
+GtkShadowType
+modest_msg_view_get_shadow_type (ModestMsgView *msg_view)
+{
+       ModestMsgViewPrivate *priv;
+       g_return_val_if_fail (MODEST_IS_MSG_VIEW (msg_view), GTK_SHADOW_NONE);
+       priv = MODEST_MSG_VIEW_GET_PRIVATE (msg_view);
+       
+       return priv->shadow_type;
 }
 
 GtkWidget*

diff --git a/src/widgets/modest-msg-view.h b/src/widgets/modest-msg-view.h
index 84d7c89..e02dfaf 100644 (file)
--- a/src/widgets/modest-msg-view.h
+++ b/src/widgets/modest-msg-view.h
@@ -121,6 +121,8 @@ GtkAdjustment *modest_msg_view_get_vadjustment (ModestMsgView *self);
 GtkAdjustment *modest_msg_view_get_hadjustment (ModestMsgView *self);
 void modest_msg_view_set_vadjustment (ModestMsgView *self, GtkAdjustment *vadj);
 void modest_msg_view_set_hadjustment (ModestMsgView *self, GtkAdjustment *hadj);
+void modest_msg_view_set_shadow_type (ModestMsgView *self, GtkShadowType type);
+GtkShadowType modest_msg_view_get_shadow_type (ModestMsgView *self);
 
 G_END_DECLS
 

diff --git a/src/widgets/modest-recpt-view.c b/src/widgets/modest-recpt-view.c
index 9eb89bd..88ec9a7 100644 (file)
--- a/src/widgets/modest-recpt-view.c
+++ b/src/widgets/modest-recpt-view.c
@@ -57,6 +57,13 @@ struct _ModestRecptViewPriv
 
 static guint signals[LAST_SIGNAL] = {0};
 
+/* static functions: GObject */
+static void modest_recpt_view_instance_init (GTypeInstance *instance, gpointer g_class);
+static void modest_recpt_view_finalize (GObject *object);
+static void modest_recpt_view_class_init (ModestRecptViewClass *klass);
+/* static functions: GtkWidget */
+static gint button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data);
+static gint button_release_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data);
 
 /**
  * modest_recpt_view_new:

diff --git a/src/widgets/modest-scroll-text.c b/src/widgets/modest-scroll-text.c
index 59875fd..e24520b 100644 (file)
--- a/src/widgets/modest-scroll-text.c
+++ b/src/widgets/modest-scroll-text.c
@@ -164,6 +164,7 @@ modest_scroll_text_set_text_view (ModestScrollText *scroll_text,
                                  GtkTextView *text_view)
 {
        ModestScrollTextPriv *priv = MODEST_SCROLL_TEXT_GET_PRIVATE (scroll_text);
+       GtkStyle *style;
 
        g_return_if_fail (MODEST_IS_SCROLL_TEXT (scroll_text));
        if (text_view == NULL) {
@@ -189,6 +190,9 @@ modest_scroll_text_set_text_view (ModestScrollText *scroll_text,
        gtk_text_view_set_left_margin (GTK_TEXT_VIEW (priv->text_view), 0);
        gtk_text_view_set_right_margin (GTK_TEXT_VIEW (priv->text_view), 0);
 
+       style = gtk_rc_get_style (GTK_WIDGET (scroll_text));
+       gtk_widget_modify_base (priv->text_view, GTK_STATE_NORMAL, & (style->bg[GTK_STATE_NORMAL]));
+
        gtk_container_add (GTK_CONTAINER (scroll_text), priv->text_view);
 
        if (GTK_WIDGET_REALIZED (scroll_text)) {