diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2011-02-16 22:35:16 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2011-02-16 22:35:16 -0500 |
| commit | 47579790755cabfc81b99010af3e81085304cc9a (patch) | |
| tree | c72c87c0ff9de519afede925c7fb2762a89c58a1 /modules | |
| parent | f74632993341828b09f955d62471b731b06276af (diff) | |
| download | gtk+-47579790755cabfc81b99010af3e81085304cc9a.tar.gz | |
gail: support indeterminate state of check menuitems
Patch by Szilárd Pfeiffer
https://bugzilla.gnome.org/show_bug.cgi?id=626730
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/other/gail/gailcheckmenuitem.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/modules/other/gail/gailcheckmenuitem.c b/modules/other/gail/gailcheckmenuitem.c index c9d285823e..52b588f1a1 100644 --- a/modules/other/gail/gailcheckmenuitem.c +++ b/modules/other/gail/gailcheckmenuitem.c @@ -122,7 +122,10 @@ gail_check_menu_item_ref_state_set (AtkObject *accessible) atk_state_set_add_state (state_set, ATK_STATE_CHECKED); if (gtk_check_menu_item_get_inconsistent (check_menu_item)) - atk_state_set_remove_state (state_set, ATK_STATE_ENABLED); + { + atk_state_set_remove_state (state_set, ATK_STATE_ENABLED); + atk_state_set_add_state (state_set, ATK_STATE_INDETERMINATE); + } return state_set; } @@ -133,23 +136,23 @@ gail_check_menu_item_real_notify_gtk (GObject *obj, { GtkCheckMenuItem *check_menu_item = GTK_CHECK_MENU_ITEM (obj); AtkObject *atk_obj; + gboolean sensitive; + gboolean inconsistent; atk_obj = gtk_widget_get_accessible (GTK_WIDGET (check_menu_item)); + sensitive = gtk_widget_get_sensitive (GTK_WIDGET (check_menu_item)); + inconsistent = gtk_check_menu_item_get_inconsistent (check_menu_item); if (strcmp (pspec->name, "inconsistent") == 0) - atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, - (gtk_widget_get_sensitive (GTK_WIDGET (check_menu_item)) && - !gtk_check_menu_item_get_inconsistent (check_menu_item))); + { + atk_object_notify_state_change (atk_obj, ATK_STATE_INDETERMINATE, inconsistent); + atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, (sensitive && !inconsistent)); + } else if (strcmp (pspec->name, "sensitive") == 0) { /* Need to override gailwidget behavior of notifying for ENABLED */ - gboolean sensitive; - gboolean enabled; - sensitive = gtk_widget_get_sensitive (GTK_WIDGET (check_menu_item)); - enabled = sensitive && - !gtk_check_menu_item_get_inconsistent (check_menu_item); - atk_object_notify_state_change (atk_obj, ATK_STATE_SENSITIVE, sensitive); - atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, enabled); + atk_object_notify_state_change (atk_obj, ATK_STATE_SENSITIVE, sensitive); + atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, (sensitive && !inconsistent)); } else GAIL_WIDGET_CLASS (gail_check_menu_item_parent_class)->notify_gtk (obj, pspec); |