forked from enlightenment/efl
parent
c198ded7af
commit
09602687a0
|
@ -74,7 +74,8 @@ _evas_render_phase1_object_process(Evas *e, Evas_Object *obj, Evas_List **active
|
||||||
evas_object_clip_recalc(obj);
|
evas_object_clip_recalc(obj);
|
||||||
/* build active object list */
|
/* build active object list */
|
||||||
is_active = evas_object_is_active(obj);
|
is_active = evas_object_is_active(obj);
|
||||||
if (is_active) *active_objects = evas_list_append(*active_objects, obj);
|
if ((is_active) || (obj->delete_me != 0))
|
||||||
|
*active_objects = evas_list_append(*active_objects, obj);
|
||||||
if (restack)
|
if (restack)
|
||||||
{
|
{
|
||||||
obj->restack = 1;
|
obj->restack = 1;
|
||||||
|
|
|
@ -164,8 +164,8 @@ evas_hash_del(Evas_Hash *hash, const char *key, const void *data)
|
||||||
for (l = hash->buckets[hash_num]; l; l = l->next)
|
for (l = hash->buckets[hash_num]; l; l = l->next)
|
||||||
{
|
{
|
||||||
el = (Evas_Hash_El *)l;
|
el = (Evas_Hash_El *)l;
|
||||||
if ((((el->key) && (key) && (!strcmp(el->key, key))) ||
|
if (((el->key) && (key) && (!strcmp(el->key, key))) ||
|
||||||
((!el->key) && (!key))) && (el->data == data))
|
((!key) && (el->data == data)))
|
||||||
{
|
{
|
||||||
hash->buckets[hash_num] = evas_object_list_remove(hash->buckets[hash_num], el);
|
hash->buckets[hash_num] = evas_object_list_remove(hash->buckets[hash_num], el);
|
||||||
if (el->key) free(el->key);
|
if (el->key) free(el->key);
|
||||||
|
@ -240,8 +240,7 @@ evas_hash_modify(Evas_Hash *hash, const char *key, const void *data)
|
||||||
for (l = hash->buckets[hash_num]; l; l = l->next)
|
for (l = hash->buckets[hash_num]; l; l = l->next)
|
||||||
{
|
{
|
||||||
el = (Evas_Hash_El *)l;
|
el = (Evas_Hash_El *)l;
|
||||||
if (((el->key) && (key) && (!strcmp(el->key, key))) ||
|
if ((el->key) && (key) && (!strcmp(el->key, key)))
|
||||||
((!el->key) && (!key)))
|
|
||||||
{
|
{
|
||||||
void *old_data;
|
void *old_data;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue