diff options
| author | Benjamin Otte <otte@redhat.com> | 2013-09-16 15:36:07 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2013-09-16 15:41:15 +0200 |
| commit | 45d896a6b5c144c7bdf956f255f59c1108dc258a (patch) | |
| tree | 1b485e387e16b1f7ee9fc3a76252f5cc6e4d4cf8 /gtk/a11y | |
| parent | 1b93b55b60c42dc38ddbc6caab5b3a30d8cc1056 (diff) | |
| download | gtk+-45d896a6b5c144c7bdf956f255f59c1108dc258a.tar.gz | |
Revert "a11y: Remove AtkSelection implementation from combobox"
This reverts commit 7cecc8e524f9ac3825622e10f8a98f5e01ac4727.
It is impossible to use the selection object of the menu while it is
collapsed (collapsed menus deselect everything for a start), so even
though the original patch was correct, the followup issues are too big
to solve this quickly to a release.
https://bugzilla.gnome.org/show_bug.cgi?id=707786
Diffstat (limited to 'gtk/a11y')
| -rw-r--r-- | gtk/a11y/gtkcomboboxaccessible.c | 108 |
1 files changed, 107 insertions, 1 deletions
diff --git a/gtk/a11y/gtkcomboboxaccessible.c b/gtk/a11y/gtkcomboboxaccessible.c index e271f8e368..1c6b294ab2 100644 --- a/gtk/a11y/gtkcomboboxaccessible.c +++ b/gtk/a11y/gtkcomboboxaccessible.c @@ -29,10 +29,12 @@ struct _GtkComboBoxAccessiblePrivate }; static void atk_action_interface_init (AtkActionIface *iface); +static void atk_selection_interface_init (AtkSelectionIface *iface); G_DEFINE_TYPE_WITH_CODE (GtkComboBoxAccessible, gtk_combo_box_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_ADD_PRIVATE (GtkComboBoxAccessible) - G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)) + G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init) + G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init)) static void changed_cb (GtkWidget *widget) @@ -51,6 +53,7 @@ changed_cb (GtkWidget *widget) { accessible->priv->old_selection = index; g_object_notify (G_OBJECT (obj), "accessible-name"); + g_signal_emit_by_name (obj, "selection-changed"); } } @@ -327,3 +330,106 @@ atk_action_interface_init (AtkActionIface *iface) iface->get_localized_name = gtk_combo_box_accessible_action_get_localized_name; iface->get_description = gtk_combo_box_accessible_action_get_description; } + +static gboolean +gtk_combo_box_accessible_add_selection (AtkSelection *selection, + gint i) +{ + GtkWidget *widget; + + widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection)); + if (widget == NULL) + return FALSE; + + gtk_combo_box_set_active (GTK_COMBO_BOX (widget), i); + + return TRUE; +} + +static gboolean +gtk_combo_box_accessible_clear_selection (AtkSelection *selection) +{ + GtkWidget *widget; + + widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection)); + if (widget == NULL) + return FALSE; + + gtk_combo_box_set_active (GTK_COMBO_BOX (widget), -1); + + return TRUE; +} + +static AtkObject * +gtk_combo_box_accessible_ref_selection (AtkSelection *selection, + gint i) +{ + GtkComboBox *combo_box; + GtkWidget *widget; + AtkObject *obj; + gint index; + + widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection)); + if (widget == NULL) + return NULL; + + if (i != 0) + return NULL; + + combo_box = GTK_COMBO_BOX (widget); + + obj = gtk_combo_box_get_popup_accessible (combo_box); + index = gtk_combo_box_get_active (combo_box); + + return atk_object_ref_accessible_child (obj, index); +} + +static gint +gtk_combo_box_accessible_get_selection_count (AtkSelection *selection) +{ + GtkWidget *widget; + + widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection)); + if (widget == NULL) + return 0; + + return (gtk_combo_box_get_active (GTK_COMBO_BOX (widget)) == -1) ? 0 : 1; +} + +static gboolean +gtk_combo_box_accessible_is_child_selected (AtkSelection *selection, + gint i) +{ + GtkWidget *widget; + gint j; + + widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection)); + + if (widget == NULL) + return FALSE; + + j = gtk_combo_box_get_active (GTK_COMBO_BOX (widget)); + + return (j == i); +} + +static gboolean +gtk_combo_box_accessible_remove_selection (AtkSelection *selection, + gint i) +{ + if (atk_selection_is_child_selected (selection, i)) + atk_selection_clear_selection (selection); + + return TRUE; +} + +static void +atk_selection_interface_init (AtkSelectionIface *iface) +{ + iface->add_selection = gtk_combo_box_accessible_add_selection; + iface->clear_selection = gtk_combo_box_accessible_clear_selection; + iface->ref_selection = gtk_combo_box_accessible_ref_selection; + iface->get_selection_count = gtk_combo_box_accessible_get_selection_count; + iface->is_child_selected = gtk_combo_box_accessible_is_child_selected; + iface->remove_selection = gtk_combo_box_accessible_remove_selection; +} |