Autoscroll in editor only if body focused (fixes NB#98705).

[modest] / src / hildon2 / modest-msg-edit-window.c

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index a9609c7..f531771 100644 (file)
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -511,6 +511,9 @@ correct_scroll_without_drag_check_idle (gpointer userdata)
        GtkTextMark *insert;
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(w);
+
+       if (!gtk_widget_is_focus (priv->msg_body))
+               return FALSE;
        
        insert = gtk_text_buffer_get_insert (priv->text_buffer);
        gtk_text_buffer_get_iter_at_mark (priv->text_buffer, &iter, insert);
@@ -794,6 +797,8 @@ init_window (ModestMsgEditWindow *obj)
        hildon_button_set_image (HILDON_BUTTON (priv->add_attachment_button), attachment_icon);
        gtk_box_pack_start (GTK_BOX (subject_box), priv->add_attachment_button, 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);
        
        priv->header_box = gtk_vbox_new (FALSE, 0);
        
@@ -1369,6 +1374,10 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        /* font_size */
        tool_item = GTK_WIDGET (gtk_menu_tool_button_new (NULL, NULL));
        priv->size_tool_button_label = gtk_label_new (NULL);
+       hildon_helper_set_logical_color (GTK_WIDGET (priv->size_tool_button_label), GTK_RC_TEXT,
+                                        GTK_STATE_INSENSITIVE, "SecondaryTextColor");
+       hildon_helper_set_logical_color (GTK_WIDGET (priv->size_tool_button_label), GTK_RC_FG,
+                                        GTK_STATE_INSENSITIVE, "SecondaryTextColor");
        snprintf(size_text, sizeof(size_text), "%d", wp_font_size[DEFAULT_FONT_SIZE]);
        markup = g_strconcat ("<span font_family='", DEFAULT_SIZE_BUTTON_FONT_FAMILY, "'>",
                              size_text,"</span>", NULL);
@@ -1411,6 +1420,10 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        /* font face */
        tool_item = GTK_WIDGET (gtk_menu_tool_button_new (NULL, NULL));
        priv->font_tool_button_label = gtk_label_new (NULL);
+       hildon_helper_set_logical_color (GTK_WIDGET (priv->font_tool_button_label), GTK_RC_TEXT,
+                                        GTK_STATE_INSENSITIVE, "SecondaryTextColor");
+       hildon_helper_set_logical_color (GTK_WIDGET (priv->font_tool_button_label), GTK_RC_FG,
+                                        GTK_STATE_INSENSITIVE, "SecondaryTextColor");
        markup = g_strconcat ("<span font_family='", wp_get_font_name(DEFAULT_FONT), "'>Tt</span>", NULL);
        gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup);
        g_free(markup);