AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

modules/other/gail/gailtogglebutton.c: Add/remove indeterminate state

Browse Source 
GailToggleButton does not set/unset ATK_STATE_INDETERMINATE according to the
value of GtkToggleButton's inconsistent property.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=626537
(cherry picked from commit 86851b7ad3)
This commit is contained in:
Szilárd Pfeiffer 2010-08-29 19:21:05 +02:00 committed by Matthias Clasen
parent 4e2ade8d6b
commit 65f10fb0f9
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/other/gail/gailtogglebutton.c
View File

@ -106,7 +106,10 @@ gail_toggle_button_ref_state_set (AtkObject *accessible)
atk_state_set_add_state (state_set, ATK_STATE_CHECKED); atk_state_set_add_state (state_set, ATK_STATE_CHECKED);
if (gtk_toggle_button_get_inconsistent (toggle_button)) if (gtk_toggle_button_get_inconsistent (toggle_button))
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; return state_set;
} }
@ -117,23 +120,23 @@ gail_toggle_button_real_notify_gtk (GObject *obj,
{ {
GtkToggleButton *toggle_button = GTK_TOGGLE_BUTTON (obj); GtkToggleButton *toggle_button = GTK_TOGGLE_BUTTON (obj);
AtkObject *atk_obj; AtkObject *atk_obj;
gboolean sensitive;
gboolean inconsistent;
atk_obj = gtk_widget_get_accessible (GTK_WIDGET (toggle_button)); atk_obj = gtk_widget_get_accessible (GTK_WIDGET (toggle_button));
sensitive = gtk_widget_get_sensitive (GTK_WIDGET (toggle_button));
inconsistent = gtk_toggle_button_get_inconsistent (toggle_button);
if (strcmp (pspec->name, "inconsistent") == 0) if (strcmp (pspec->name, "inconsistent") == 0)
atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, {
(gtk_widget_get_sensitive (GTK_WIDGET (toggle_button)) && atk_object_notify_state_change (atk_obj, ATK_STATE_INDETERMINATE, inconsistent);
!gtk_toggle_button_get_inconsistent (toggle_button))); atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, (sensitive && !inconsistent));
}
else if (strcmp (pspec->name, "sensitive") == 0) else if (strcmp (pspec->name, "sensitive") == 0)
{ {
/* Need to override gailwidget behavior of notifying for ENABLED */ /* Need to override gailwidget behavior of notifying for ENABLED */
gboolean sensitive; atk_object_notify_state_change (atk_obj, ATK_STATE_SENSITIVE, sensitive);
gboolean enabled; atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, (sensitive && !inconsistent));
sensitive = gtk_widget_get_sensitive (GTK_WIDGET (toggle_button));
enabled = sensitive &&
!gtk_toggle_button_get_inconsistent (toggle_button);
atk_object_notify_state_change (atk_obj, ATK_STATE_SENSITIVE, sensitive);
atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, enabled);
} }
else else
GAIL_WIDGET_CLASS (gail_toggle_button_parent_class)->notify_gtk (obj, pspec); GAIL_WIDGET_CLASS (gail_toggle_button_parent_class)->notify_gtk (obj, pspec);