forked from enlightenment/efl
elm: refactoring. on_deletion -> delete_me.
1. delete_me was already there before on_deletion was used. 2. delete_me and on_deletion are same. 3. evas also has delete_me so use the same name. 4. i didn't change naviframe because it has different on_deletion usages from other widgets. SVN revision: 80528
This commit is contained in:
parent
b230457c42
commit
e8152fd7c3
|
@ -147,7 +147,7 @@ _sizing_eval(Evas_Object *obj)
|
||||||
ELM_BOX_DATA_GET(obj, sd);
|
ELM_BOX_DATA_GET(obj, sd);
|
||||||
Elm_Widget_Smart_Data *wd = eo_data_get(obj, ELM_OBJ_WIDGET_CLASS);
|
Elm_Widget_Smart_Data *wd = eo_data_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||||
|
|
||||||
if (sd->on_deletion)
|
if (sd->delete_me)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
evas_object_size_hint_min_get
|
evas_object_size_hint_min_get
|
||||||
|
@ -428,7 +428,7 @@ _elm_box_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
||||||
Evas_Object *child;
|
Evas_Object *child;
|
||||||
|
|
||||||
Elm_Box_Smart_Data *sd = _pd;
|
Elm_Box_Smart_Data *sd = _pd;
|
||||||
sd->on_deletion = EINA_TRUE;
|
sd->delete_me = EINA_TRUE;
|
||||||
|
|
||||||
Elm_Widget_Smart_Data *wd = eo_data_get(obj, ELM_OBJ_WIDGET_CLASS);
|
Elm_Widget_Smart_Data *wd = eo_data_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||||
evas_object_event_callback_del_full
|
evas_object_event_callback_del_full
|
||||||
|
|
|
@ -26,7 +26,7 @@ _elm_panel_smart_sizing_eval(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
||||||
Elm_Panel_Smart_Data *sd = _pd;
|
Elm_Panel_Smart_Data *sd = _pd;
|
||||||
Elm_Widget_Smart_Data *wd = eo_data_get(obj, ELM_OBJ_WIDGET_CLASS);
|
Elm_Widget_Smart_Data *wd = eo_data_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||||
|
|
||||||
if (sd->on_deletion) return;
|
if (sd->delete_me) return;
|
||||||
|
|
||||||
evas_object_smart_calculate(sd->bx);
|
evas_object_smart_calculate(sd->bx);
|
||||||
edje_object_size_min_calc(wd->resize_obj, &mw, &mh);
|
edje_object_size_min_calc(wd->resize_obj, &mw, &mh);
|
||||||
|
@ -355,7 +355,7 @@ _elm_panel_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
||||||
Elm_Panel_Smart_Data *sd = _pd;
|
Elm_Panel_Smart_Data *sd = _pd;
|
||||||
Elm_Widget_Smart_Data *wd = eo_data_get(obj, ELM_OBJ_WIDGET_CLASS);
|
Elm_Widget_Smart_Data *wd = eo_data_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||||
|
|
||||||
sd->on_deletion = EINA_TRUE;
|
sd->delete_me = EINA_TRUE;
|
||||||
|
|
||||||
/* let's make our box object the *last* to be processed, since it
|
/* let's make our box object the *last* to be processed, since it
|
||||||
* may (smart) parent other sub objects here */
|
* may (smart) parent other sub objects here */
|
||||||
|
|
|
@ -443,7 +443,7 @@ _elm_prefs_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Elm_Prefs_Smart_Data *sd = _pd;
|
Elm_Prefs_Smart_Data *sd = _pd;
|
||||||
|
|
||||||
sd->on_deletion = EINA_TRUE;
|
sd->delete_me = EINA_TRUE;
|
||||||
|
|
||||||
if (sd->saving_poller) ecore_poller_del(sd->saving_poller);
|
if (sd->saving_poller) ecore_poller_del(sd->saving_poller);
|
||||||
|
|
||||||
|
@ -2046,7 +2046,7 @@ elm_prefs_page_iface_unregister(const Elm_Prefs_Page_Iface_Info *array)
|
||||||
|
|
||||||
/* ELM_PREFS_DATA_GET(page->prefs, sd); */
|
/* ELM_PREFS_DATA_GET(page->prefs, sd); */
|
||||||
|
|
||||||
/* if (!sd->on_deletion) */
|
/* if (!sd->delete_me) */
|
||||||
/* { */
|
/* { */
|
||||||
/* Eina_List *l; */
|
/* Eina_List *l; */
|
||||||
/* Elm_Prefs_Item_Node *it; */
|
/* Elm_Prefs_Item_Node *it; */
|
||||||
|
@ -2080,7 +2080,7 @@ _prefs_item_del_cb(void *data __UNUSED__,
|
||||||
|
|
||||||
ELM_PREFS_DATA_GET(it->prefs, sd);
|
ELM_PREFS_DATA_GET(it->prefs, sd);
|
||||||
|
|
||||||
if (!sd->on_deletion)
|
if (!sd->delete_me)
|
||||||
/* force writing back the value for it */
|
/* force writing back the value for it */
|
||||||
_item_changed_cb(obj);
|
_item_changed_cb(obj);
|
||||||
|
|
||||||
|
|
|
@ -1001,7 +1001,7 @@ _elm_toolbar_smart_theme(Eo *obj, void *_pd, va_list *list)
|
||||||
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
|
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
|
||||||
if (ret) *ret = EINA_FALSE;
|
if (ret) *ret = EINA_FALSE;
|
||||||
|
|
||||||
if (sd->on_deletion)
|
if (sd->delete_me)
|
||||||
{
|
{
|
||||||
if (ret) *ret = EINA_TRUE;
|
if (ret) *ret = EINA_TRUE;
|
||||||
return;
|
return;
|
||||||
|
@ -1671,11 +1671,11 @@ _item_del_pre_hook(Elm_Object_Item *it)
|
||||||
|
|
||||||
if (item != sd->more_item) /* more item does not get in the list */
|
if (item != sd->more_item) /* more item does not get in the list */
|
||||||
{
|
{
|
||||||
if (!sd->on_deletion)
|
if (!sd->delete_me)
|
||||||
next = ELM_TOOLBAR_ITEM_FROM_INLIST(EINA_INLIST_GET(item)->next);
|
next = ELM_TOOLBAR_ITEM_FROM_INLIST(EINA_INLIST_GET(item)->next);
|
||||||
sd->items = eina_inlist_remove(sd->items, EINA_INLIST_GET(item));
|
sd->items = eina_inlist_remove(sd->items, EINA_INLIST_GET(item));
|
||||||
sd->item_count--;
|
sd->item_count--;
|
||||||
if (!sd->on_deletion)
|
if (!sd->delete_me)
|
||||||
{
|
{
|
||||||
if (!next) next = ELM_TOOLBAR_ITEM_FROM_INLIST(sd->items);
|
if (!next) next = ELM_TOOLBAR_ITEM_FROM_INLIST(sd->items);
|
||||||
if ((sd->select_mode == ELM_OBJECT_SELECT_MODE_ALWAYS) &&
|
if ((sd->select_mode == ELM_OBJECT_SELECT_MODE_ALWAYS) &&
|
||||||
|
@ -2238,7 +2238,7 @@ _elm_toolbar_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
||||||
|
|
||||||
Elm_Toolbar_Smart_Data *sd = _pd;
|
Elm_Toolbar_Smart_Data *sd = _pd;
|
||||||
|
|
||||||
sd->on_deletion = EINA_TRUE;
|
sd->delete_me = EINA_TRUE;
|
||||||
|
|
||||||
if (sd->resize_job)
|
if (sd->resize_job)
|
||||||
ecore_job_del(sd->resize_job);
|
ecore_job_del(sd->resize_job);
|
||||||
|
|
Loading…
Reference in New Issue