diff options
| author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2017-01-20 11:52:52 -0500 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2017-01-20 11:52:24 -0500 |
| commit | 75224784bd5fde6420e6a4e67f61ab12a2eaf573 (patch) | |
| tree | 09224d38154611f75f222dfa2b22a76bfd670d90 | |
| parent | 6ebb68777c1f78ade034d3e5d7b506a290165c33 (diff) | |
| download | enlightenment-75224784bd5fde6420e6a4e67f61ab12a2eaf573.tar.gz | |
reset demo gadget id before deleting gadget object during drop operation
ensure that the gadget is marked as usable so that the config isn't deleted
| -rw-r--r-- | src/bin/e_gadget.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/e_gadget.c b/src/bin/e_gadget.c index 957096fd8d..ebd1a6c9cc 100644 --- a/src/bin/e_gadget.c +++ b/src/bin/e_gadget.c @@ -1056,12 +1056,12 @@ _site_drop(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) EINA_LIST_REVERSE_FOREACH(drop->gadgets, ll, dzgc) { evas_object_smart_callback_call(zgs->layout, "gadget_moved", dzgc->gadget); + if (dzgc->id == -1) dzgc->id = 0; evas_object_del(dzgc->gadget); zgs->gadget_list = eina_inlist_prepend_relative(zgs->gadget_list, EINA_INLIST_GET(dzgc), EINA_INLIST_GET(zgc)); zgs->gadgets = eina_list_prepend_relative_list(zgs->gadgets, dzgc, l); dzgc->site = zgs; - if (dzgc->id == -1) dzgc->id = 0; dzgc->zone = -1; _gadget_object_finalize(dzgc); } @@ -1069,12 +1069,12 @@ _site_drop(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) EINA_LIST_REVERSE_FOREACH(drop->gadgets, ll, dzgc) { evas_object_smart_callback_call(zgs->layout, "gadget_moved", dzgc->gadget); + if (dzgc->id == -1) dzgc->id = 0; evas_object_del(dzgc->gadget); zgs->gadget_list = eina_inlist_append_relative(zgs->gadget_list, EINA_INLIST_GET(dzgc), EINA_INLIST_GET(zgc)); zgs->gadgets = eina_list_append_relative_list(zgs->gadgets, dzgc, l); dzgc->site = zgs; - if (dzgc->id == -1) dzgc->id = 0; dzgc->zone = -1; _gadget_object_finalize(dzgc); } @@ -1123,12 +1123,12 @@ _site_drop(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) EINA_LIST_FOREACH(drop->gadgets, l, dzgc) { evas_object_smart_callback_call(zgs->layout, "gadget_moved", dzgc->gadget); + if (dzgc->id == -1) dzgc->id = 0; evas_object_del(dzgc->gadget); zgs->gadget_list = eina_inlist_append(zgs->gadget_list, EINA_INLIST_GET(dzgc)); zgs->gadgets = eina_list_append(zgs->gadgets, dzgc); dzgc->site = zgs; - if (dzgc->id == -1) dzgc->id = 0; dzgc->zone = -1; _gadget_object_finalize(dzgc); } @@ -1169,6 +1169,7 @@ _site_drop(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) } else dzgc->zone = -1; + if (dzgc->id == -1) dzgc->id = 0; evas_object_del(dzgc->gadget); zgs->gadget_list = eina_inlist_append(zgs->gadget_list, EINA_INLIST_GET(dzgc)); @@ -1178,7 +1179,6 @@ _site_drop(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) dzgc->w = gw / (double)w; dzgc->h = gh / (double)h; dzgc->site = zgs; - if (dzgc->id == -1) dzgc->id = 0; _gadget_object_finalize(dzgc); } } |