forked from enlightenment/enlightenment
slightly simplify image data setting in e_comp_object_render()
This commit is contained in:
parent
77e8ab0926
commit
881ccfc768
|
@ -3807,9 +3807,7 @@ e_comp_object_render(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
Eina_Bool alpha = e_pixmap_image_is_argb(cw->ec->pixmap);
|
Eina_Bool alpha = e_pixmap_image_is_argb(cw->ec->pixmap);
|
||||||
|
|
||||||
it = NULL;
|
|
||||||
pix = e_pixmap_image_data_get(cw->ec->pixmap);
|
pix = e_pixmap_image_data_get(cw->ec->pixmap);
|
||||||
evas_object_image_data_set(cw->obj, cw->blanked ? NULL : pix);
|
|
||||||
evas_object_image_alpha_set(cw->obj, alpha);
|
evas_object_image_alpha_set(cw->obj, alpha);
|
||||||
ret = EINA_TRUE;
|
ret = EINA_TRUE;
|
||||||
goto end;
|
goto end;
|
||||||
|
@ -3839,7 +3837,6 @@ e_comp_object_render(Evas_Object *obj)
|
||||||
}
|
}
|
||||||
RENDER_DEBUG("UPDATE [%p] %i %i %ix%i", cw->ec, r->x, r->y, r->w, r->h);
|
RENDER_DEBUG("UPDATE [%p] %i %i %ix%i", cw->ec, r->x, r->y, r->w, r->h);
|
||||||
}
|
}
|
||||||
evas_object_image_data_set(cw->obj, cw->blanked ? NULL : pix);
|
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3866,15 +3863,15 @@ e_comp_object_render(Evas_Object *obj)
|
||||||
e_pixmap_image_data_argb_convert(cw->ec->pixmap, pix, srcpix, r, stride);
|
e_pixmap_image_data_argb_convert(cw->ec->pixmap, pix, srcpix, r, stride);
|
||||||
RENDER_DEBUG("UPDATE [%p]: %d %d %dx%d -- pix = %p", cw->ec, r->x, r->y, r->w, r->h, pix);
|
RENDER_DEBUG("UPDATE [%p]: %d %d %dx%d -- pix = %p", cw->ec, r->x, r->y, r->w, r->h, pix);
|
||||||
}
|
}
|
||||||
evas_object_image_data_set(cw->obj, cw->blanked ? NULL : pix);
|
eina_iterator_free(it);
|
||||||
end:
|
end:
|
||||||
|
evas_object_image_data_set(cw->obj, cw->blanked ? NULL : pix);
|
||||||
EINA_LIST_FOREACH(cw->obj_mirror, l, o)
|
EINA_LIST_FOREACH(cw->obj_mirror, l, o)
|
||||||
{
|
{
|
||||||
evas_object_image_data_set(o, pix);
|
evas_object_image_data_set(o, pix);
|
||||||
evas_object_image_pixels_dirty_set(o, EINA_FALSE);
|
evas_object_image_pixels_dirty_set(o, EINA_FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
eina_iterator_free(it);
|
|
||||||
E_FREE_FUNC(cw->pending_updates, eina_tiler_free);
|
E_FREE_FUNC(cw->pending_updates, eina_tiler_free);
|
||||||
if (ret)
|
if (ret)
|
||||||
e_comp_client_post_update_add(cw->ec);
|
e_comp_client_post_update_add(cw->ec);
|
||||||
|
|
Loading…
Reference in New Issue