summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitesh Singh <amitesh.sh@samsung.com>2014-07-07 12:20:54 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-07-07 12:20:54 +0900
commitaef8aeb9b8d0187f8c01a507b93b128fe88410a3 (patch)
tree3543930c8625ff3c28efcc1a987e7c2dab54c5fc
parent97e1fb1f77a4517a6cde5724f67098ca5654ef76 (diff)
list/genlist/gengrid/toolbar: removed unused smart data member prev_focused_item.
Reviewers: raster, seoz CC: seoz Differential Revision: https://phab.enlightenment.org/D1119
-rw-r--r--src/lib/elm_gengrid.c5
-rw-r--r--src/lib/elm_genlist.c5
-rw-r--r--src/lib/elm_list.c5
-rw-r--r--src/lib/elm_toolbar.c4
-rw-r--r--src/lib/elm_widget_gengrid.h1
-rw-r--r--src/lib/elm_widget_genlist.h1
-rw-r--r--src/lib/elm_widget_list.h1
-rw-r--r--src/lib/elm_widget_toolbar.h1
8 files changed, 0 insertions, 23 deletions
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 19c0b9b5e..b97e6ee51 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -1547,8 +1547,6 @@ _elm_gengrid_item_unfocused(Elm_Gen_Item *it)
1547 (it != (Elm_Gen_Item *)sd->focused_item)) 1547 (it != (Elm_Gen_Item *)sd->focused_item))
1548 return; 1548 return;
1549 1549
1550 sd->prev_focused_item = (Elm_Object_Item *)it;
1551
1552 if (elm_widget_focus_highlight_enabled_get(obj)) 1550 if (elm_widget_focus_highlight_enabled_get(obj))
1553 { 1551 {
1554 edje_object_signal_emit 1552 edje_object_signal_emit
@@ -2814,7 +2812,6 @@ _elm_gengrid_elm_widget_on_focus(Eo *obj, Elm_Gengrid_Data *sd)
2814 { 2812 {
2815 if (sd->focused_item) 2813 if (sd->focused_item)
2816 { 2814 {
2817 sd->prev_focused_item = sd->focused_item;
2818 sd->last_focused_item = sd->focused_item; 2815 sd->last_focused_item = sd->focused_item;
2819 _elm_gengrid_item_unfocused((Elm_Gen_Item *)sd->focused_item); 2816 _elm_gengrid_item_unfocused((Elm_Gen_Item *)sd->focused_item);
2820 } 2817 }
@@ -2917,8 +2914,6 @@ _elm_gengrid_item_del_not_serious(Elm_Gen_Item *it)
2917 sd->focused_item = NULL; 2914 sd->focused_item = NULL;
2918 if (sd->last_focused_item == (Elm_Object_Item *)it) 2915 if (sd->last_focused_item == (Elm_Object_Item *)it)
2919 sd->last_focused_item = NULL; 2916 sd->last_focused_item = NULL;
2920 if (sd->prev_focused_item == (Elm_Object_Item *)it)
2921 sd->prev_focused_item = NULL;
2922 2917
2923 if (it->itc->func.del) 2918 if (it->itc->func.del)
2924 it->itc->func.del((void *)it->base.data, WIDGET(it)); 2919 it->itc->func.del((void *)it->base.data, WIDGET(it));
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 49535eb0b..c596c2a17 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -2489,8 +2489,6 @@ _elm_genlist_item_unfocused(Elm_Gen_Item *it)
2489 (it != (Elm_Gen_Item *)sd->focused_item)) 2489 (it != (Elm_Gen_Item *)sd->focused_item))
2490 return; 2490 return;
2491 2491
2492 sd->prev_focused_item = (Elm_Object_Item *)it;
2493
2494 if (elm_widget_focus_highlight_enabled_get(obj)) 2492 if (elm_widget_focus_highlight_enabled_get(obj))
2495 edje_object_signal_emit 2493 edje_object_signal_emit
2496 (VIEW(sd->focused_item), "elm,state,unfocused", "elm"); 2494 (VIEW(sd->focused_item), "elm,state,unfocused", "elm");
@@ -2958,7 +2956,6 @@ _elm_genlist_elm_widget_on_focus(Eo *obj, Elm_Genlist_Data *sd)
2958 { 2956 {
2959 if (sd->focused_item) 2957 if (sd->focused_item)
2960 { 2958 {
2961 sd->prev_focused_item = sd->focused_item;
2962 sd->last_focused_item = sd->focused_item; 2959 sd->last_focused_item = sd->focused_item;
2963 _elm_genlist_item_unfocused((Elm_Gen_Item *)sd->focused_item); 2960 _elm_genlist_item_unfocused((Elm_Gen_Item *)sd->focused_item);
2964 } 2961 }
@@ -3333,8 +3330,6 @@ _elm_genlist_item_del_not_serious(Elm_Gen_Item *it)
3333 sd->last_focused_item = NULL; 3330 sd->last_focused_item = NULL;
3334 if (sd->focused_item == (Elm_Object_Item *)it) 3331 if (sd->focused_item == (Elm_Object_Item *)it)
3335 sd->focused_item = NULL; 3332 sd->focused_item = NULL;
3336 if (sd->prev_focused_item == (Elm_Object_Item *)it)
3337 sd->prev_focused_item = NULL;
3338 if (sd->last_selected_item == (Elm_Object_Item *)it) 3333 if (sd->last_selected_item == (Elm_Object_Item *)it)
3339 sd->last_selected_item = NULL; 3334 sd->last_selected_item = NULL;
3340 3335
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index c1053f394..4e1e0ddbb 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -83,8 +83,6 @@ _elm_list_item_free(Elm_List_Item *it)
83 sd->focused_item = NULL; 83 sd->focused_item = NULL;
84 if (sd->last_focused_item == (Elm_Object_Item *)it) 84 if (sd->last_focused_item == (Elm_Object_Item *)it)
85 sd->last_focused_item = NULL; 85 sd->last_focused_item = NULL;
86 if (sd->prev_focused_item == (Elm_Object_Item *)it)
87 sd->prev_focused_item = NULL;
88 if (sd->last_selected_item == (Elm_Object_Item *)it) 86 if (sd->last_selected_item == (Elm_Object_Item *)it)
89 sd->last_selected_item = NULL; 87 sd->last_selected_item = NULL;
90 88
@@ -316,7 +314,6 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction dir)
316 ELM_LIST_DATA_GET_OR_RETURN_VAL(obj, sd, EINA_FALSE); 314 ELM_LIST_DATA_GET_OR_RETURN_VAL(obj, sd, EINA_FALSE);
317 Elm_List_Item *it = NULL; 315 Elm_List_Item *it = NULL;
318 316
319 sd->prev_focused_item = sd->focused_item;
320 if (sd->focused_item) 317 if (sd->focused_item)
321 it = _next_item_get(sd, (Elm_List_Item *)sd->focused_item, dir); 318 it = _next_item_get(sd, (Elm_List_Item *)sd->focused_item, dir);
322 319
@@ -1133,7 +1130,6 @@ _elm_list_item_unfocused(Elm_List_Item *it)
1133 (it != (Elm_List_Item *)sd->focused_item)) 1130 (it != (Elm_List_Item *)sd->focused_item))
1134 return; 1131 return;
1135 1132
1136 sd->prev_focused_item = (Elm_Object_Item *)it;
1137 if (sd->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY) 1133 if (sd->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY)
1138 return; 1134 return;
1139 1135
@@ -1249,7 +1245,6 @@ _elm_list_elm_widget_on_focus(Eo *obj, Elm_List_Data *sd)
1249 } 1245 }
1250 else 1246 else
1251 { 1247 {
1252 sd->prev_focused_item = sd->focused_item;
1253 sd->last_focused_item = sd->focused_item; 1248 sd->last_focused_item = sd->focused_item;
1254 if (sd->focused_item) 1249 if (sd->focused_item)
1255 _elm_list_item_unfocused((Elm_List_Item *)sd->focused_item); 1250 _elm_list_item_unfocused((Elm_List_Item *)sd->focused_item);
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index ea6758bf8..e84600ad4 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -640,7 +640,6 @@ _elm_toolbar_item_unfocused(Elm_Object_Item *it)
640 return; 640 return;
641 if (sd->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY) 641 if (sd->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY)
642 return; 642 return;
643 sd->prev_focused_item = it;
644 if (elm_widget_focus_highlight_enabled_get(obj)) 643 if (elm_widget_focus_highlight_enabled_get(obj))
645 { 644 {
646 edje_object_signal_emit 645 edje_object_signal_emit
@@ -749,7 +748,6 @@ _elm_toolbar_elm_widget_on_focus(Eo *obj, Elm_Toolbar_Data *sd)
749 } 748 }
750 else 749 else
751 { 750 {
752 sd->prev_focused_item = sd->focused_item;
753 sd->last_focused_item = sd->focused_item; 751 sd->last_focused_item = sd->focused_item;
754 if (sd->focused_item) 752 if (sd->focused_item)
755 _elm_toolbar_item_unfocused(sd->focused_item); 753 _elm_toolbar_item_unfocused(sd->focused_item);
@@ -1137,8 +1135,6 @@ _item_del(Elm_Toolbar_Item *it)
1137 sd->focused_item = NULL; 1135 sd->focused_item = NULL;
1138 if (sd->last_focused_item == (Elm_Object_Item *)it) 1136 if (sd->last_focused_item == (Elm_Object_Item *)it)
1139 sd->last_focused_item = NULL; 1137 sd->last_focused_item = NULL;
1140 if (sd->prev_focused_item == (Elm_Object_Item *)it)
1141 sd->prev_focused_item = NULL;
1142 1138
1143 evas_object_del(it->object); 1139 evas_object_del(it->object);
1144 //TODO: See if checking for sd->menu_parent is necessary before 1140 //TODO: See if checking for sd->menu_parent is necessary before
diff --git a/src/lib/elm_widget_gengrid.h b/src/lib/elm_widget_gengrid.h
index 7bde3cebb..a44d0fc98 100644
--- a/src/lib/elm_widget_gengrid.h
+++ b/src/lib/elm_widget_gengrid.h
@@ -40,7 +40,6 @@ struct _Elm_Gengrid_Data
40 Elm_Object_Item *last_selected_item; 40 Elm_Object_Item *last_selected_item;
41 Elm_Object_Item *focused_item; /**< a focused item by keypad arrow or mouse. This is set to NULL if widget looses focus. */ 41 Elm_Object_Item *focused_item; /**< a focused item by keypad arrow or mouse. This is set to NULL if widget looses focus. */
42 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. */ 42 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. */
43 Elm_Object_Item *prev_focused_item; /**< a previous focused item by keypad arrow or mouse. */
44 Elm_Gen_Item *show_it; 43 Elm_Gen_Item *show_it;
45 Elm_Gen_Item *bring_in_it; 44 Elm_Gen_Item *bring_in_it;
46 Elm_Gengrid_Item_Scrollto_Type scroll_to_type; 45 Elm_Gengrid_Item_Scrollto_Type scroll_to_type;
diff --git a/src/lib/elm_widget_genlist.h b/src/lib/elm_widget_genlist.h
index f210627e6..ab0945bbf 100644
--- a/src/lib/elm_widget_genlist.h
+++ b/src/lib/elm_widget_genlist.h
@@ -49,7 +49,6 @@ struct _Elm_Genlist_Data
49 Elm_Object_Item *last_selected_item; 49 Elm_Object_Item *last_selected_item;
50 Elm_Object_Item *focused_item; /**< a focused item by keypad arrow or mouse. This is set to NULL if widget looses focus. */ 50 Elm_Object_Item *focused_item; /**< a focused item by keypad arrow or mouse. This is set to NULL if widget looses focus. */
51 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. */ 51 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. */
52 Elm_Object_Item *prev_focused_item; /**< a previous focused item by keypad arrow or mouse. */
53 Ecore_Job *calc_job; 52 Ecore_Job *calc_job;
54 int walking; 53 int walking;
55 int item_width, item_height; 54 int item_width, item_height;
diff --git a/src/lib/elm_widget_list.h b/src/lib/elm_widget_list.h
index d6d1869da..0ee0d8791 100644
--- a/src/lib/elm_widget_list.h
+++ b/src/lib/elm_widget_list.h
@@ -28,7 +28,6 @@ struct _Elm_List_Data
28 Eina_List *items, *selected, *to_delete; 28 Eina_List *items, *selected, *to_delete;
29 Elm_Object_Item *last_selected_item; 29 Elm_Object_Item *last_selected_item;
30 Elm_Object_Item *focused_item; /**< a focused item by keypad arrow or mouse. This is set to NULL if widget looses focus. */ 30 Elm_Object_Item *focused_item; /**< a focused item by keypad arrow or mouse. This is set to NULL if widget looses focus. */
31 Elm_Object_Item *prev_focused_item; /**< a previous focused item by keypad arrow or mouse. */
32 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. */ 31 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. */
33 Evas_Coord minw[2], minh[2]; 32 Evas_Coord minw[2], minh[2];
34 Elm_Object_Select_Mode select_mode; 33 Elm_Object_Select_Mode select_mode;
diff --git a/src/lib/elm_widget_toolbar.h b/src/lib/elm_widget_toolbar.h
index fe2c4a321..60609a20c 100644
--- a/src/lib/elm_widget_toolbar.h
+++ b/src/lib/elm_widget_toolbar.h
@@ -31,7 +31,6 @@ struct _Elm_Toolbar_Data
31 Elm_Toolbar_Item *selected_item; /**< a selected item by mouse click, return key, api, and etc. */ 31 Elm_Toolbar_Item *selected_item; /**< a selected item by mouse click, return key, api, and etc. */
32 Elm_Object_Item *focused_item; /**< a focused item by keypad arrow or mouse. This is set to NULL if widget looses focus. */ 32 Elm_Object_Item *focused_item; /**< a focused item by keypad arrow or mouse. This is set to NULL if widget looses focus. */
33 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. */ 33 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. */
34 Elm_Object_Item *prev_focused_item; /**< a previous focused item by keypad arrow or mouse. */
35 Elm_Toolbar_Item *reorder_empty, *reorder_item; 34 Elm_Toolbar_Item *reorder_empty, *reorder_item;
36 Elm_Toolbar_Shrink_Mode shrink_mode; 35 Elm_Toolbar_Shrink_Mode shrink_mode;
37 Elm_Icon_Lookup_Order lookup_order; 36 Elm_Icon_Lookup_Order lookup_order;