From 24ce4835c1e590a30ddeee20e83e40af3ffa68da Mon Sep 17 00:00:00 2001 From: Amitesh Singh Date: Mon, 7 Jul 2014 12:20:54 +0900 Subject: [PATCH] list/genlist/gengrid/toolbar: removed unused smart data member prev_focused_item. Reviewers: raster, seoz CC: seoz Differential Revision: https://phab.enlightenment.org/D1119 --- legacy/elementary/src/lib/elm_gengrid.c | 5 ----- legacy/elementary/src/lib/elm_genlist.c | 5 ----- legacy/elementary/src/lib/elm_list.c | 5 ----- legacy/elementary/src/lib/elm_toolbar.c | 4 ---- legacy/elementary/src/lib/elm_widget_gengrid.h | 1 - legacy/elementary/src/lib/elm_widget_genlist.h | 1 - legacy/elementary/src/lib/elm_widget_list.h | 1 - legacy/elementary/src/lib/elm_widget_toolbar.h | 1 - 8 files changed, 23 deletions(-) diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c index 19c0b9b5eb..b97e6ee518 100644 --- a/legacy/elementary/src/lib/elm_gengrid.c +++ b/legacy/elementary/src/lib/elm_gengrid.c @@ -1547,8 +1547,6 @@ _elm_gengrid_item_unfocused(Elm_Gen_Item *it) (it != (Elm_Gen_Item *)sd->focused_item)) return; - sd->prev_focused_item = (Elm_Object_Item *)it; - if (elm_widget_focus_highlight_enabled_get(obj)) { edje_object_signal_emit @@ -2814,7 +2812,6 @@ _elm_gengrid_elm_widget_on_focus(Eo *obj, Elm_Gengrid_Data *sd) { if (sd->focused_item) { - sd->prev_focused_item = sd->focused_item; sd->last_focused_item = sd->focused_item; _elm_gengrid_item_unfocused((Elm_Gen_Item *)sd->focused_item); } @@ -2917,8 +2914,6 @@ _elm_gengrid_item_del_not_serious(Elm_Gen_Item *it) sd->focused_item = NULL; if (sd->last_focused_item == (Elm_Object_Item *)it) sd->last_focused_item = NULL; - if (sd->prev_focused_item == (Elm_Object_Item *)it) - sd->prev_focused_item = NULL; if (it->itc->func.del) it->itc->func.del((void *)it->base.data, WIDGET(it)); diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c index 49535eb0bb..c596c2a17a 100644 --- a/legacy/elementary/src/lib/elm_genlist.c +++ b/legacy/elementary/src/lib/elm_genlist.c @@ -2489,8 +2489,6 @@ _elm_genlist_item_unfocused(Elm_Gen_Item *it) (it != (Elm_Gen_Item *)sd->focused_item)) return; - sd->prev_focused_item = (Elm_Object_Item *)it; - if (elm_widget_focus_highlight_enabled_get(obj)) edje_object_signal_emit (VIEW(sd->focused_item), "elm,state,unfocused", "elm"); @@ -2958,7 +2956,6 @@ _elm_genlist_elm_widget_on_focus(Eo *obj, Elm_Genlist_Data *sd) { if (sd->focused_item) { - sd->prev_focused_item = sd->focused_item; sd->last_focused_item = sd->focused_item; _elm_genlist_item_unfocused((Elm_Gen_Item *)sd->focused_item); } @@ -3333,8 +3330,6 @@ _elm_genlist_item_del_not_serious(Elm_Gen_Item *it) sd->last_focused_item = NULL; if (sd->focused_item == (Elm_Object_Item *)it) sd->focused_item = NULL; - if (sd->prev_focused_item == (Elm_Object_Item *)it) - sd->prev_focused_item = NULL; if (sd->last_selected_item == (Elm_Object_Item *)it) sd->last_selected_item = NULL; diff --git a/legacy/elementary/src/lib/elm_list.c b/legacy/elementary/src/lib/elm_list.c index c1053f3946..4e1e0ddbb8 100644 --- a/legacy/elementary/src/lib/elm_list.c +++ b/legacy/elementary/src/lib/elm_list.c @@ -83,8 +83,6 @@ _elm_list_item_free(Elm_List_Item *it) sd->focused_item = NULL; if (sd->last_focused_item == (Elm_Object_Item *)it) sd->last_focused_item = NULL; - if (sd->prev_focused_item == (Elm_Object_Item *)it) - sd->prev_focused_item = NULL; if (sd->last_selected_item == (Elm_Object_Item *)it) sd->last_selected_item = NULL; @@ -316,7 +314,6 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction dir) ELM_LIST_DATA_GET_OR_RETURN_VAL(obj, sd, EINA_FALSE); Elm_List_Item *it = NULL; - sd->prev_focused_item = sd->focused_item; if (sd->focused_item) it = _next_item_get(sd, (Elm_List_Item *)sd->focused_item, dir); @@ -1133,7 +1130,6 @@ _elm_list_item_unfocused(Elm_List_Item *it) (it != (Elm_List_Item *)sd->focused_item)) return; - sd->prev_focused_item = (Elm_Object_Item *)it; if (sd->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY) return; @@ -1249,7 +1245,6 @@ _elm_list_elm_widget_on_focus(Eo *obj, Elm_List_Data *sd) } else { - sd->prev_focused_item = sd->focused_item; sd->last_focused_item = sd->focused_item; if (sd->focused_item) _elm_list_item_unfocused((Elm_List_Item *)sd->focused_item); diff --git a/legacy/elementary/src/lib/elm_toolbar.c b/legacy/elementary/src/lib/elm_toolbar.c index ea6758bf8e..e84600ad46 100644 --- a/legacy/elementary/src/lib/elm_toolbar.c +++ b/legacy/elementary/src/lib/elm_toolbar.c @@ -640,7 +640,6 @@ _elm_toolbar_item_unfocused(Elm_Object_Item *it) return; if (sd->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY) return; - sd->prev_focused_item = it; if (elm_widget_focus_highlight_enabled_get(obj)) { edje_object_signal_emit @@ -749,7 +748,6 @@ _elm_toolbar_elm_widget_on_focus(Eo *obj, Elm_Toolbar_Data *sd) } else { - sd->prev_focused_item = sd->focused_item; sd->last_focused_item = sd->focused_item; if (sd->focused_item) _elm_toolbar_item_unfocused(sd->focused_item); @@ -1137,8 +1135,6 @@ _item_del(Elm_Toolbar_Item *it) sd->focused_item = NULL; if (sd->last_focused_item == (Elm_Object_Item *)it) sd->last_focused_item = NULL; - if (sd->prev_focused_item == (Elm_Object_Item *)it) - sd->prev_focused_item = NULL; evas_object_del(it->object); //TODO: See if checking for sd->menu_parent is necessary before diff --git a/legacy/elementary/src/lib/elm_widget_gengrid.h b/legacy/elementary/src/lib/elm_widget_gengrid.h index 7bde3cebb1..a44d0fc98f 100644 --- a/legacy/elementary/src/lib/elm_widget_gengrid.h +++ b/legacy/elementary/src/lib/elm_widget_gengrid.h @@ -40,7 +40,6 @@ struct _Elm_Gengrid_Data Elm_Object_Item *last_selected_item; Elm_Object_Item *focused_item; /**< a focused item by keypad arrow or mouse. This is set to NULL if widget looses focus. */ Elm_Object_Item *last_focused_item; /**< This records the last focused item when widget looses focus. This is required to set the focus on last focused item when widgets gets focus. */ - Elm_Object_Item *prev_focused_item; /**< a previous focused item by keypad arrow or mouse. */ Elm_Gen_Item *show_it; Elm_Gen_Item *bring_in_it; Elm_Gengrid_Item_Scrollto_Type scroll_to_type; diff --git a/legacy/elementary/src/lib/elm_widget_genlist.h b/legacy/elementary/src/lib/elm_widget_genlist.h index f210627e65..ab0945bbf9 100644 --- a/legacy/elementary/src/lib/elm_widget_genlist.h +++ b/legacy/elementary/src/lib/elm_widget_genlist.h @@ -49,7 +49,6 @@ struct _Elm_Genlist_Data Elm_Object_Item *last_selected_item; Elm_Object_Item *focused_item; /**< a focused item by keypad arrow or mouse. This is set to NULL if widget looses focus. */ Elm_Object_Item *last_focused_item; /**< This records the last focused item when widget looses focus. This is required to set the focus on last focused item when widgets gets focus. */ - Elm_Object_Item *prev_focused_item; /**< a previous focused item by keypad arrow or mouse. */ Ecore_Job *calc_job; int walking; int item_width, item_height; diff --git a/legacy/elementary/src/lib/elm_widget_list.h b/legacy/elementary/src/lib/elm_widget_list.h index d6d1869daf..0ee0d87915 100644 --- a/legacy/elementary/src/lib/elm_widget_list.h +++ b/legacy/elementary/src/lib/elm_widget_list.h @@ -28,7 +28,6 @@ struct _Elm_List_Data Eina_List *items, *selected, *to_delete; Elm_Object_Item *last_selected_item; Elm_Object_Item *focused_item; /**< a focused item by keypad arrow or mouse. This is set to NULL if widget looses focus. */ - Elm_Object_Item *prev_focused_item; /**< a previous focused item by keypad arrow or mouse. */ Elm_Object_Item *last_focused_item; /**< This records the last focused item when widget looses focus. This is required to set the focus on last focused item when widgets gets focus. */ Evas_Coord minw[2], minh[2]; Elm_Object_Select_Mode select_mode; diff --git a/legacy/elementary/src/lib/elm_widget_toolbar.h b/legacy/elementary/src/lib/elm_widget_toolbar.h index fe2c4a321a..60609a20cc 100644 --- a/legacy/elementary/src/lib/elm_widget_toolbar.h +++ b/legacy/elementary/src/lib/elm_widget_toolbar.h @@ -31,7 +31,6 @@ struct _Elm_Toolbar_Data Elm_Toolbar_Item *selected_item; /**< a selected item by mouse click, return key, api, and etc. */ Elm_Object_Item *focused_item; /**< a focused item by keypad arrow or mouse. This is set to NULL if widget looses focus. */ Elm_Object_Item *last_focused_item; /**< This records the last focused item when widget looses focus. This is required to set the focus on last focused item when widgets gets focus. */ - Elm_Object_Item *prev_focused_item; /**< a previous focused item by keypad arrow or mouse. */ Elm_Toolbar_Item *reorder_empty, *reorder_item; Elm_Toolbar_Shrink_Mode shrink_mode; Elm_Icon_Lookup_Order lookup_order;