summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--legacy/evas/src/lib/canvas/evas_render.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/legacy/evas/src/lib/canvas/evas_render.c b/legacy/evas/src/lib/canvas/evas_render.c
index 1f6bff970d..ca7bbf8256 100644
--- a/legacy/evas/src/lib/canvas/evas_render.c
+++ b/legacy/evas/src/lib/canvas/evas_render.c
@@ -1431,7 +1431,9 @@ evas_render_updates_internal(Evas *eo_e,
1431 } 1431 }
1432 } 1432 }
1433 1433
1434 Evas_Object_Protected_Data *framespace_clip = eo_data_get(e->framespace.clip, EVAS_OBJ_CLASS); 1434 Evas_Object_Protected_Data *framespace_clip =
1435 eo_data_get(e->framespace.clip, EVAS_OBJ_CLASS);
1436
1435 EINA_RECTANGLE_SET(&clip_rect, 1437 EINA_RECTANGLE_SET(&clip_rect,
1436 framespace_clip->cur.geometry.x, 1438 framespace_clip->cur.geometry.x,
1437 framespace_clip->cur.geometry.y, 1439 framespace_clip->cur.geometry.y,
@@ -1453,6 +1455,12 @@ evas_render_updates_internal(Evas *eo_e,
1453 1455
1454 if (obj->delete_me) continue; 1456 if (obj->delete_me) continue;
1455 1457
1458 eo_obj = obj->object;
1459
1460 /* skip clipping if the object is itself the
1461 * framespace clip */
1462 if (eo_obj == framespace_clip->object) continue;
1463
1456 EINA_RECTANGLE_SET(&obj_rect, 1464 EINA_RECTANGLE_SET(&obj_rect,
1457 obj->cur.geometry.x, obj->cur.geometry.y, 1465 obj->cur.geometry.x, obj->cur.geometry.y,
1458 obj->cur.geometry.w, obj->cur.geometry.h); 1466 obj->cur.geometry.w, obj->cur.geometry.h);
@@ -1463,12 +1471,8 @@ evas_render_updates_internal(Evas *eo_e,
1463 1471
1464 if (!(pclip = evas_object_clip_get(eo_obj))) 1472 if (!(pclip = evas_object_clip_get(eo_obj)))
1465 { 1473 {
1466 /* skip clipping if the object is itself the
1467 * framespace clip */
1468 if (eo_obj == e->framespace.clip) continue;
1469
1470 /* clip this object so it does not draw on the window frame */ 1474 /* clip this object so it does not draw on the window frame */
1471 evas_object_clip_set(eo_obj, e->framespace.clip); 1475 evas_object_clip_set(eo_obj, framespace_clip->object);
1472 } 1476 }
1473 } 1477 }
1474 } 1478 }