raster pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=a279852c8629ad498b0333274ea368060ec4d672

commit a279852c8629ad498b0333274ea368060ec4d672
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date:   Wed Jan 25 18:44:58 2017 +0900

    evas - proxy - fix clipping of proxy renders that broke terminology
    
    so proxies just rendered nothing when used in terminology. they used
    to work for the tab switcher (ctl+shift+home). this now works again.
    
    there is a good chance this may break something else though... what i
    can't seem to find...
    
    this fixes T5131
---
 src/lib/evas/canvas/evas_render.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/lib/evas/canvas/evas_render.c 
b/src/lib/evas/canvas/evas_render.c
index c7b9688..551c423 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -2140,9 +2140,10 @@ evas_render_mapped(Evas_Public_Data *evas, Evas_Object 
*eo_obj,
                                  if ((_evas_render_has_map(obj) && 
!_evas_render_can_map(obj)) ||
                                      
_evas_render_object_is_mask(obj->cur->clipper))
                                    evas_object_clip_recalc(obj);
-                                 _evas_render_mapped_context_clip_set(evas, 
eo_obj, obj, ctx,
-                                                                      
proxy_render_data,
-                                                                      off_x, 
off_y);
+                                 if (!proxy_render_data)
+                                   _evas_render_mapped_context_clip_set(evas, 
eo_obj, obj, ctx,
+                                                                        
proxy_render_data,
+                                                                        off_x, 
off_y);
                               }
                             else
                               {

-- 


Reply via email to