From fa5a7a0472cf4153318c30ab84524529e2d63afe Mon Sep 17 00:00:00 2001 From: Bolian Yin Date: Wed, 10 Dec 2003 03:56:31 +0000 Subject: corret index error in week view. impl. get_index_in_parent emit signal 2003-12-05 Bolian Yin * calendar/ea-cal-view-event.c (ea_cal_view_event_get_index_in_parent): corret index error in week view. * calendar/ea-day-view-cell.c: impl. get_index_in_parent * calendar/ea-day-view-main-item.c: emit signal "active-descendant-changed", fix error in selection_interface_ref_selection. * widgets/ea-calendar-cell.c: impl. get_index_in_parent. * widgets/ea-calendar-item.c: change signature of e_calendar_item_get_offset_for_date, emit signal "active-descendant-changed". svn path=/trunk/; revision=23902 --- a11y/calendar/ea-cal-view-event.c | 19 +++++++++++-------- a11y/calendar/ea-day-view-cell.c | 27 ++++++++++++++++++++++++--- a11y/calendar/ea-day-view-main-item.c | 33 ++++++++++++++++++++++++++++++--- 3 files changed, 65 insertions(+), 14 deletions(-) (limited to 'a11y/calendar') diff --git a/a11y/calendar/ea-cal-view-event.c b/a11y/calendar/ea-cal-view-event.c index 37b0d5ed90..5f9e7eb9ba 100644 --- a/a11y/calendar/ea-cal-view-event.c +++ b/a11y/calendar/ea-cal-view-event.c @@ -346,15 +346,18 @@ ea_cal_view_event_get_index_in_parent (AtkObject *accessible) } } else if (E_IS_WEEK_VIEW (cal_view)) { - gint index; - EWeekViewEvent *week_view_event; - EWeekView *week_view = E_WEEK_VIEW (cal_view); - - for (index = week_view->events->len - 1; index >= 0; --index) { - week_view_event = &g_array_index (week_view->events, - EWeekViewEvent, index); - if (cal_view_event == (ECalendarViewEvent*)week_view_event) + AtkObject *atk_parent, *atk_child; + gint index = 0; + + atk_parent = atk_object_get_parent (accessible); + while ((atk_child = atk_object_ref_accessible_child (atk_parent, + index)) != NULL) { + if (atk_child == accessible) { + g_object_unref (atk_child); return index; + } + g_object_unref (atk_child); + ++index; } } else { diff --git a/a11y/calendar/ea-day-view-cell.c b/a11y/calendar/ea-day-view-cell.c index 52fb860fd6..6fe6cf7077 100644 --- a/a11y/calendar/ea-day-view-cell.c +++ b/a11y/calendar/ea-day-view-cell.c @@ -95,6 +95,7 @@ static G_CONST_RETURN gchar* ea_day_view_cell_get_name (AtkObject *accessible); static G_CONST_RETURN gchar* ea_day_view_cell_get_description (AtkObject *accessible); static AtkStateSet* ea_day_view_cell_ref_state_set (AtkObject *obj); static AtkObject * ea_day_view_cell_get_parent (AtkObject *accessible); +static gint ea_day_view_cell_get_index_in_parent (AtkObject *accessible); /* component interface */ static void atk_component_interface_init (AtkComponentIface *iface); @@ -160,6 +161,7 @@ ea_day_view_cell_class_init (EaDayViewCellClass *klass) class->ref_state_set = ea_day_view_cell_ref_state_set; class->get_parent = ea_day_view_cell_get_parent; + class->get_index_in_parent = ea_day_view_cell_get_index_in_parent; } AtkObject* @@ -280,7 +282,28 @@ ea_day_view_cell_get_parent (AtkObject *accessible) return NULL; cell = E_DAY_VIEW_CELL (g_obj); - return gtk_widget_get_accessible (GTK_WIDGET (cell->day_view->main_canvas)); + return atk_gobject_accessible_for_object (G_OBJECT (cell->day_view->main_canvas_item)); +} + +static gint +ea_day_view_cell_get_index_in_parent (AtkObject *accessible) +{ + AtkGObjectAccessible *atk_gobj; + GObject *g_obj; + EDayViewCell *cell; + AtkObject *parent; + + g_return_val_if_fail (EA_IS_DAY_VIEW_CELL (accessible), -1); + + atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible); + g_obj = atk_gobject_accessible_get_object (atk_gobj); + if (!g_obj) + return -1; + + cell = E_DAY_VIEW_CELL (g_obj); + parent = atk_object_get_parent (accessible); + return atk_table_get_index_at (ATK_TABLE (parent), + cell->row, cell->column); } /* Atk Component Interface */ @@ -329,8 +352,6 @@ component_interface_get_extents (AtkComponent *component, *x += day_view->day_offsets[cell->column] - scroll_x; *y += day_view->row_height * cell->row - scroll_y; - printf ("ybl: cellrow=%d, cellcol=%d, scroll_x=%d, scroll_y=%d\n", - cell->row, cell->column, scroll_x, scroll_y); *width = day_view->day_widths[cell->column]; *height = day_view->row_height; } diff --git a/a11y/calendar/ea-day-view-main-item.c b/a11y/calendar/ea-day-view-main-item.c index af8d704178..3583da5a31 100644 --- a/a11y/calendar/ea-day-view-main-item.c +++ b/a11y/calendar/ea-day-view-main-item.c @@ -422,6 +422,7 @@ static void ea_day_view_main_item_time_change_cb (EDayView *day_view, gpointer data) { EaDayViewMainItem *ea_main_item; + AtkObject *item_cell = NULL; g_return_if_fail (E_IS_DAY_VIEW (day_view)); g_return_if_fail (data); @@ -432,6 +433,18 @@ ea_day_view_main_item_time_change_cb (EDayView *day_view, gpointer data) #ifdef ACC_DEBUG printf ("EvoAcc: ea_day_view_main_item time changed cb\n"); #endif + /* only deal with the first selected child, for now */ + item_cell = atk_selection_ref_selection (ATK_SELECTION (ea_main_item), + 0); + if (item_cell) { + AtkStateSet *state_set; + state_set = atk_object_ref_state_set (item_cell); + atk_state_set_add_state (state_set, ATK_STATE_FOCUSED); + g_object_unref (state_set); + } + g_signal_emit_by_name (ea_main_item, + "active-descendant-changed", + item_cell); g_signal_emit_by_name (data, "selection_changed"); } @@ -1187,9 +1200,23 @@ selection_interface_clear_selection (AtkSelection *selection) static AtkObject* selection_interface_ref_selection (AtkSelection *selection, gint i) { - if (selection_interface_is_child_selected (selection, i)) - return ea_day_view_main_item_ref_child (ATK_OBJECT (selection), i); - return NULL; + gint count; + GObject *g_obj; + EDayView *day_view; + EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (selection); + gint start_index; + + count = selection_interface_get_selection_count (selection); + if (i < 0 || i >=count) + return NULL; + + g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (ea_main_item)); + day_view = E_DAY_VIEW_MAIN_ITEM (g_obj)->day_view; + start_index = ea_day_view_main_item_get_child_index_at (ea_main_item, + day_view->selection_start_row, + day_view->selection_start_day); + + return ea_day_view_main_item_ref_child (ATK_OBJECT (selection), start_index + i); } static gint -- cgit v1.2.3