mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-10 19:00:08 +00:00
modules/other/gail/gailtogglebutton.c: Add/remove indeterminate state
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
This commit is contained in:
parent
f84707d6f9
commit
86851b7ad3
@ -106,7 +106,10 @@ gail_toggle_button_ref_state_set (AtkObject *accessible)
|
||||
atk_state_set_add_state (state_set, ATK_STATE_CHECKED);
|
||||
|
||||
if (gtk_toggle_button_get_inconsistent (toggle_button))
|
||||
{
|
||||
atk_state_set_remove_state (state_set, ATK_STATE_ENABLED);
|
||||
atk_state_set_add_state (state_set, ATK_STATE_INDETERMINATE);
|
||||
}
|
||||
|
||||
return state_set;
|
||||
}
|
||||
@ -117,23 +120,23 @@ gail_toggle_button_real_notify_gtk (GObject *obj,
|
||||
{
|
||||
GtkToggleButton *toggle_button = GTK_TOGGLE_BUTTON (obj);
|
||||
AtkObject *atk_obj;
|
||||
gboolean sensitive;
|
||||
gboolean inconsistent;
|
||||
|
||||
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)
|
||||
atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED,
|
||||
(gtk_widget_get_sensitive (GTK_WIDGET (toggle_button)) &&
|
||||
!gtk_toggle_button_get_inconsistent (toggle_button)));
|
||||
{
|
||||
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 (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);
|
||||
atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, (sensitive && !inconsistent));
|
||||
}
|
||||
else
|
||||
GAIL_WIDGET_CLASS (gail_toggle_button_parent_class)->notify_gtk (obj, pspec);
|
||||
|
Loading…
Reference in New Issue
Block a user