Dim font color toolitem instead of the button

pmo-drop-split-view-r6905

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index 0e42787..862c787 100644 (file)
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -252,6 +252,7 @@ struct _ModestMsgEditWindowPrivate {
        GtkWidget   *font_size_toolitem;
        GtkWidget   *font_face_toolitem;
        GtkWidget   *font_color_button;
+       GtkWidget   *font_color_toolitem;
        GSList      *font_items_group;
        GtkWidget   *font_tool_button_label;
        GSList      *size_items_group;
@@ -1310,14 +1311,14 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        insert_index = gtk_toolbar_get_item_index(GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM(placeholder));
 
        /* font color */
-       tool_item = GTK_WIDGET (gtk_tool_item_new ());
+       priv->font_color_toolitem = GTK_WIDGET (gtk_tool_item_new ());
        priv->font_color_button = hildon_color_button_new ();
        GTK_WIDGET_UNSET_FLAGS (tool_item, GTK_CAN_FOCUS);
        GTK_WIDGET_UNSET_FLAGS (priv->font_color_button, GTK_CAN_FOCUS);
-       gtk_container_add (GTK_CONTAINER (tool_item), priv->font_color_button);
-       gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE);
-       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);
-       gtk_toolbar_insert(GTK_TOOLBAR(parent_priv->toolbar), GTK_TOOL_ITEM (tool_item), insert_index);
+       gtk_container_add (GTK_CONTAINER (priv->font_color_toolitem), priv->font_color_button);
+       gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->font_color_toolitem), TRUE);
+       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->font_color_toolitem), TRUE);
+       gtk_toolbar_insert(GTK_TOOLBAR(parent_priv->toolbar), GTK_TOOL_ITEM (priv->font_color_toolitem), insert_index);
        g_signal_connect_swapped (G_OBJECT (priv->font_color_button), 
                                  "notify::color", 
                                  G_CALLBACK (modest_msg_edit_window_color_button_change), 
@@ -1491,7 +1492,7 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre
                                              modest_msg_edit_window_toolbar_dimming_entries,
                                              G_N_ELEMENTS (modest_msg_edit_window_toolbar_dimming_entries),
                                              MODEST_WINDOW (obj));
-       modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->font_color_button,
+       modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->font_color_toolitem,
                                                    G_CALLBACK (modest_ui_dimming_rules_on_set_style),
                                                    MODEST_WINDOW (obj));
        modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->font_size_toolitem,