Set left padding to abook and attachment buttons in editor

pmo-trunk-r7868

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index a2ceb08..8acc49f 100644 (file)
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -696,6 +696,7 @@ init_window (ModestMsgEditWindow *obj)
 {
        GtkWidget *to_caption, *subject_caption;
        GtkWidget *main_vbox;
+       GtkWidget *add_attachment_align;
        ModestMsgEditWindowPrivate *priv;
        GtkActionGroup *action_group;
        ModestWindowPrivate *parent_priv;
@@ -795,7 +796,10 @@ init_window (ModestMsgEditWindow *obj)
        gtk_button_set_focus_on_click (GTK_BUTTON (priv->add_attachment_button), FALSE);
        attachment_icon = gtk_image_new_from_icon_name (MODEST_HEADER_ICON_ATTACH, HILDON_ICON_SIZE_FINGER);
        hildon_button_set_image (HILDON_BUTTON (priv->add_attachment_button), attachment_icon);
-       gtk_box_pack_start (GTK_BOX (priv->subject_box), priv->add_attachment_button, FALSE, FALSE, 0);
+       add_attachment_align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+       gtk_alignment_set_padding (GTK_ALIGNMENT (add_attachment_align), 0, 0, MODEST_MARGIN_DEFAULT, 0);
+       gtk_container_add (GTK_CONTAINER (add_attachment_align), priv->add_attachment_button);
+       gtk_box_pack_start (GTK_BOX (priv->subject_box), add_attachment_align, FALSE, FALSE, 0);
        priv->attachments_view = modest_attachments_view_new (NULL);
        modest_attachments_view_set_style (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
                                           MODEST_ATTACHMENTS_VIEW_STYLE_NO_FOCUS);

diff --git a/src/widgets/modest-recpt-editor.c b/src/widgets/modest-recpt-editor.c
index cadaf31..ea78c4f 100644 (file)
--- a/src/widgets/modest-recpt-editor.c
+++ b/src/widgets/modest-recpt-editor.c
@@ -353,6 +353,7 @@ modest_recpt_editor_instance_init (GTypeInstance *instance, gpointer g_class)
 {
        ModestRecptEditorPrivate *priv;
        GtkWidget *abook_icon;
+       GtkWidget *abook_align;
        GtkTextBuffer *buffer;
 
        priv = MODEST_RECPT_EDITOR_GET_PRIVATE (instance);
@@ -399,7 +400,10 @@ modest_recpt_editor_instance_init (GTypeInstance *instance, gpointer g_class)
        gtk_box_pack_start (GTK_BOX (instance), priv->scrolled_window, TRUE, TRUE, 0);
 /*     gtk_box_pack_start (GTK_BOX (instance), priv->text_view, TRUE, TRUE, 0); */
 #endif
-       gtk_box_pack_end (GTK_BOX (instance), priv->abook_button, FALSE, FALSE, 0);
+       abook_align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+       gtk_alignment_set_padding (GTK_ALIGNMENT (abook_align), 0, 0, MODEST_MARGIN_DEFAULT, 0);
+       gtk_container_add (GTK_CONTAINER (abook_align), priv->abook_button);
+       gtk_box_pack_end (GTK_BOX (instance), abook_align, FALSE, FALSE, 0);
 
        gtk_text_view_set_accepts_tab (GTK_TEXT_VIEW (priv->text_view), FALSE);
        gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (priv->text_view), TRUE);