From 9be03ff09f3ae25ef904bfb1c7bcb4f637d0c57b Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Fri, 24 Apr 2009 21:46:14 +0000 Subject: [PATCH] New dimming rule system, to allow dimming buttons in the UI pmo-trunk-r9132 --- src/hildon2/modest-msg-edit-window.c | 2 +- src/modest-dimming-rule.c | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c index c21155c..8af8bcd 100644 --- a/src/hildon2/modest-msg-edit-window.c +++ b/src/hildon2/modest-msg-edit-window.c @@ -915,7 +915,7 @@ init_window (ModestMsgEditWindow *obj) priv->send_button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT); send_icon = gtk_image_new_from_icon_name (MODEST_TOOLBAR_ICON_MAIL_SEND, HILDON_ICON_SIZE_FINGER); gtk_container_add (GTK_CONTAINER (priv->send_button), send_icon); - gtk_size_group_add_widget (title_size_group, send_icon); + gtk_widget_set_size_request (GTK_WIDGET (priv->send_button), 118, -1); g_object_unref (title_size_group); g_object_unref (value_size_group); diff --git a/src/modest-dimming-rule.c b/src/modest-dimming-rule.c index 61e40c6..b179952 100644 --- a/src/modest-dimming-rule.c +++ b/src/modest-dimming-rule.c @@ -191,10 +191,16 @@ modest_dimming_rule_process (ModestDimmingRule *self) if (GTK_IS_TOOL_ITEM (priv->widget)) { gtk_widget_set_sensitive (priv->widget, !dimmed); } else { - if (dimmed) - gtk_widget_hide (priv->widget); - else - gtk_widget_show (priv->widget); + GtkWidget *parent; + parent = gtk_widget_get_parent (priv->widget); + if (parent && HILDON_IS_APP_MENU (parent)) { + if (dimmed) + gtk_widget_hide (priv->widget); + else + gtk_widget_show (priv->widget); + } else { + gtk_widget_set_sensitive (priv->widget, !dimmed); + } } #else gtk_widget_set_sensitive (priv->widget, !dimmed); -- 1.7.9.5