diff options
author | Jean-Philippe Andre <jp.andre@samsung.com> | 2016-12-20 15:47:54 +0900 |
---|---|---|
committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2016-12-20 15:47:54 +0900 |
commit | a28cb93d0dbac6db51391a5891b148d62b28c78c (patch) | |
tree | 878dd38c5846be4019937d7fd48c492d607ed838 /src/lib/evas/include/evas_private.h | |
parent | bb91c4b45d1cf010920fd9bd906e7207de7c69b6 (diff) |
Revert "evas: Add source_region property to proxy objects"
This reverts commit 4e110a34bffe09abe4dd793f9ecf1cf3884ccf22.
Urgh. I'm stupid. Conceptually I still like the idea of the
region proxy, that only renders part of the source object
in a proxy surface. The problem right now is that the proxy
subrender mechanism renders to a surface that belongs to
the **source** and not the proxy object. As a consequence,
the region would become a property of the source, rather than
the proxy, which is not at all the intention of the original
patch. In other words, everything would fall apart if an object
has more than one proxy, for whatever reason.
I realized that when trying to actually test the region proxy.
It didn't work at all. Revert for now.
Diffstat (limited to 'src/lib/evas/include/evas_private.h')
-rw-r--r-- | src/lib/evas/include/evas_private.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h index c1f938829a..9e0561ce44 100644 --- a/src/lib/evas/include/evas_private.h +++ b/src/lib/evas/include/evas_private.h | |||
@@ -1920,7 +1920,6 @@ struct _Evas_Proxy_Render_Data | |||
1920 | Evas_Object_Protected_Data *src_obj; | 1920 | Evas_Object_Protected_Data *src_obj; |
1921 | Evas_Object *eo_proxy; | 1921 | Evas_Object *eo_proxy; |
1922 | Evas_Object *eo_src; | 1922 | Evas_Object *eo_src; |
1923 | Eina_Rectangle region; | ||
1924 | Eina_Bool source_clip : 1; | 1923 | Eina_Bool source_clip : 1; |
1925 | }; | 1924 | }; |
1926 | 1925 | ||
@@ -1980,7 +1979,7 @@ Eina_Bool evas_render_mapped(Evas_Public_Data *e, Evas_Object *obj, | |||
1980 | int level, Eina_Bool do_async); | 1979 | int level, Eina_Bool do_async); |
1981 | void evas_render_invalidate(Evas *e); | 1980 | void evas_render_invalidate(Evas *e); |
1982 | void evas_render_object_recalc(Evas_Object *obj); | 1981 | void evas_render_object_recalc(Evas_Object *obj); |
1983 | void evas_render_proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_proxy, Evas_Object_Protected_Data *proxy_obj, Eina_Rectangle region, Eina_Bool source_clip, Eina_Bool do_async); | 1982 | void evas_render_proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_proxy, Evas_Object_Protected_Data *proxy_obj, Eina_Bool source_clip, Eina_Bool do_async); |
1984 | void evas_render_mask_subrender(Evas_Public_Data *e, Evas_Object_Protected_Data *mask, Evas_Object_Protected_Data *prev_mask, int level, Eina_Bool do_async); | 1983 | void evas_render_mask_subrender(Evas_Public_Data *e, Evas_Object_Protected_Data *mask, Evas_Object_Protected_Data *prev_mask, int level, Eina_Bool do_async); |
1985 | 1984 | ||
1986 | Eina_Bool evas_map_inside_get(const Evas_Map *m, Evas_Coord x, Evas_Coord y); | 1985 | Eina_Bool evas_map_inside_get(const Evas_Map *m, Evas_Coord x, Evas_Coord y); |