forked from enlightenment/efl
evas - For compatibility, Make proxy's source clip to be optional. Im checking partal code for zmike.
This commit is contained in:
parent
25f1706fa8
commit
188c345b27
|
@ -3254,7 +3254,8 @@ _proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Eina_Bool do_async)
|
||||||
evas_render_mapped(e, eo_source, source, ctx, proxy_write->surface,
|
evas_render_mapped(e, eo_source, source, ctx, proxy_write->surface,
|
||||||
-source->cur->geometry.x,
|
-source->cur->geometry.x,
|
||||||
-source->cur->geometry.y,
|
-source->cur->geometry.y,
|
||||||
1, 0, 0, e->output.w, e->output.h, EINA_TRUE
|
1, 0, 0, e->output.w, e->output.h, EINA_TRUE,
|
||||||
|
EINA_TRUE
|
||||||
#ifdef REND_DBG
|
#ifdef REND_DBG
|
||||||
, 1
|
, 1
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -950,7 +950,8 @@ Eina_Bool
|
||||||
evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
|
evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
|
||||||
Evas_Object_Protected_Data *obj, void *context,
|
Evas_Object_Protected_Data *obj, void *context,
|
||||||
void *surface, int off_x, int off_y, int mapped, int ecx,
|
void *surface, int off_x, int off_y, int mapped, int ecx,
|
||||||
int ecy, int ecw, int ech, Eina_Bool proxy_render
|
int ecy, int ecw, int ech, Eina_Bool proxy_render,
|
||||||
|
Eina_Bool proxy_src_clip
|
||||||
#ifdef REND_DBG
|
#ifdef REND_DBG
|
||||||
, int level
|
, int level
|
||||||
#endif
|
#endif
|
||||||
|
@ -971,7 +972,7 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
|
||||||
{
|
{
|
||||||
if (obj->clip.clipees || obj->cur->have_clipees)
|
if (obj->clip.clipees || obj->cur->have_clipees)
|
||||||
{
|
{
|
||||||
if (!proxy_render)
|
if (!proxy_render || proxy_src_clip)
|
||||||
{
|
{
|
||||||
if (!evas_object_is_visible(eo_obj, obj))
|
if (!evas_object_is_visible(eo_obj, obj))
|
||||||
{
|
{
|
||||||
|
@ -1132,7 +1133,8 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
|
||||||
obj->map->surface,
|
obj->map->surface,
|
||||||
off_x2, off_y2, 1,
|
off_x2, off_y2, 1,
|
||||||
ecx, ecy, ecw, ech,
|
ecx, ecy, ecw, ech,
|
||||||
proxy_render
|
proxy_render,
|
||||||
|
proxy_src_clip
|
||||||
#ifdef REND_DBG
|
#ifdef REND_DBG
|
||||||
, level + 1
|
, level + 1
|
||||||
#endif
|
#endif
|
||||||
|
@ -1263,7 +1265,8 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
|
||||||
obj2, ctx, surface,
|
obj2, ctx, surface,
|
||||||
off_x, off_y, 1,
|
off_x, off_y, 1,
|
||||||
ecx, ecy, ecw, ech,
|
ecx, ecy, ecw, ech,
|
||||||
proxy_render
|
proxy_render,
|
||||||
|
proxy_src_clip
|
||||||
#ifdef REND_DBG
|
#ifdef REND_DBG
|
||||||
, level + 1
|
, level + 1
|
||||||
#endif
|
#endif
|
||||||
|
@ -1275,7 +1278,7 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
|
||||||
RDI(level);
|
RDI(level);
|
||||||
|
|
||||||
//FIXME: Consider to clip by the proxy clipper.
|
//FIXME: Consider to clip by the proxy clipper.
|
||||||
if (!proxy_render && obj->cur->clipper)
|
if ((!proxy_render || proxy_src_clip) && obj->cur->clipper)
|
||||||
{
|
{
|
||||||
RD(" clip: %i %i %ix%i [%i %i %ix%i]\n",
|
RD(" clip: %i %i %ix%i [%i %i %ix%i]\n",
|
||||||
obj->cur->cache.clip.x + off_x,
|
obj->cur->cache.clip.x + off_x,
|
||||||
|
@ -1320,7 +1323,7 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
//FIXME: Consider to clip by the proxy clipper.
|
//FIXME: Consider to clip by the proxy clipper.
|
||||||
if (!proxy_render && obj->cur->clipper)
|
if ((!proxy_render || proxy_src_clip) && obj->cur->clipper)
|
||||||
{
|
{
|
||||||
int x, y, w, h;
|
int x, y, w, h;
|
||||||
|
|
||||||
|
@ -1742,6 +1745,7 @@ evas_render_updates_internal(Evas *eo_e,
|
||||||
surface, off_x,
|
surface, off_x,
|
||||||
off_y, 0,
|
off_y, 0,
|
||||||
cx, cy, cw, ch,
|
cx, cy, cw, ch,
|
||||||
|
EINA_FALSE,
|
||||||
EINA_FALSE
|
EINA_FALSE
|
||||||
#ifdef REND_DBG
|
#ifdef REND_DBG
|
||||||
, 1
|
, 1
|
||||||
|
|
|
@ -1239,7 +1239,7 @@ Eina_Bool evas_render_mapped(Evas_Public_Data *e, Evas_Object *obj,
|
||||||
Evas_Object_Protected_Data *source_pd,
|
Evas_Object_Protected_Data *source_pd,
|
||||||
void *context, void *surface, int off_x, int off_y,
|
void *context, void *surface, int off_x, int off_y,
|
||||||
int mapped, int ecx, int ecy, int ecw, int ech,
|
int mapped, int ecx, int ecy, int ecw, int ech,
|
||||||
Eina_Bool proxy_render
|
Eina_Bool proxy_render, Eina_Bool proxy_src_clip
|
||||||
#ifdef REND_DBG
|
#ifdef REND_DBG
|
||||||
, int level
|
, int level
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue