summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-02-27 13:17:37 -0500
committerMike Blumenkrantz <zmike@samsung.com>2019-02-27 13:17:37 -0500
commita5e183ad5d1c4495c2149341b4a6e7c086b26e00 (patch)
treea685b7a95590e8f4167caee9a13e312cdd1c3f6e
parent540d3b95874e1ebdcbd6ccf9eaf1cab0af30f833 (diff)
efl.canvas.object: clip -> clipper && clipees -> clipped_objects
Summary: also clipees_has -> clipped_objects_count ref T7555 Depends on D8039 Reviewers: segfaultxavi Reviewed By: segfaultxavi Subscribers: segfaultxavi, cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T7555 Differential Revision: https://phab.enlightenment.org/D8040
-rw-r--r--src/examples/evas/evas-object-manipulation-eo.c8
-rw-r--r--src/lib/elementary/efl_page_transition_scroll.c38
-rw-r--r--src/lib/elementary/efl_ui_image.c8
-rw-r--r--src/lib/elementary/efl_ui_image.eo2
-rw-r--r--src/lib/elementary/efl_ui_pager.c20
-rw-r--r--src/lib/elementary/efl_ui_text.c2
-rw-r--r--src/lib/elementary/efl_ui_widget.c6
-rw-r--r--src/lib/elementary/efl_ui_widget.eo2
-rw-r--r--src/lib/evas/Evas_Legacy.h13
-rw-r--r--src/lib/evas/canvas/efl_canvas_group.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo19
-rw-r--r--src/lib/evas/canvas/evas_clip.c39
-rw-r--r--src/lib/evas/canvas/evas_object_intercept.c4
-rw-r--r--src/lib/evas/canvas/evas_object_main.c8
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c14
-rw-r--r--src/lib/evas/include/evas_private.h6
-rw-r--r--src/tests/edje/edje_test_features.c4
-rw-r--r--src/tests/evas/evas_test_mask.c2
18 files changed, 109 insertions, 88 deletions
diff --git a/src/examples/evas/evas-object-manipulation-eo.c b/src/examples/evas/evas-object-manipulation-eo.c
index 081d063641..4d4c37fa90 100644
--- a/src/examples/evas/evas-object-manipulation-eo.c
+++ b/src/examples/evas/evas-object-manipulation-eo.c
@@ -122,15 +122,15 @@ _on_keydown(void *data EINA_UNUSED,
122 printf("Toggling clipping "); 122 printf("Toggling clipping ");
123 123
124 Evas_Object *clip = NULL; 124 Evas_Object *clip = NULL;
125 clip = efl_canvas_object_clip_get(d.img); 125 clip = efl_canvas_object_clipper_get(d.img);
126 if (clip == d.clipper) 126 if (clip == d.clipper)
127 { 127 {
128 efl_canvas_object_clip_set(d.img, NULL); 128 efl_canvas_object_clipper_set(d.img, NULL);
129 printf("off\n"); 129 printf("off\n");
130 } 130 }
131 else 131 else
132 { 132 {
133 efl_canvas_object_clip_set(d.img, d.clipper); 133 efl_canvas_object_clipper_set(d.img, d.clipper);
134 printf("on\n"); 134 printf("on\n");
135 } 135 }
136 return; 136 return;
@@ -237,7 +237,7 @@ main(void)
237 efl_gfx_entity_size_set(d.clipper, EINA_SIZE2D(WIDTH / 2, HEIGHT / 2)); 237 efl_gfx_entity_size_set(d.clipper, EINA_SIZE2D(WIDTH / 2, HEIGHT / 2));
238 efl_gfx_entity_visible_set(d.clipper, EINA_TRUE); 238 efl_gfx_entity_visible_set(d.clipper, EINA_TRUE);
239 239
240 efl_canvas_object_clip_set(d.img, d.clipper); 240 efl_canvas_object_clipper_set(d.img, d.clipper);
241 241
242 printf("%s", commands); 242 printf("%s", commands);
243 243
diff --git a/src/lib/elementary/efl_page_transition_scroll.c b/src/lib/elementary/efl_page_transition_scroll.c
index 34209aea63..4979206153 100644
--- a/src/lib/elementary/efl_page_transition_scroll.c
+++ b/src/lib/elementary/efl_page_transition_scroll.c
@@ -116,10 +116,10 @@ _page_info_geometry_change(Efl_Page_Transition_Scroll_Data *pd,
116 { 116 {
117 if (curr->visible) 117 if (curr->visible)
118 { 118 {
119 efl_canvas_object_clip_set(curr->obj, pd->backclip); 119 efl_canvas_object_clipper_set(curr->obj, pd->backclip);
120 120
121 efl_pack_unpack(curr->obj, curr->content); 121 efl_pack_unpack(curr->obj, curr->content);
122 efl_canvas_object_clip_set(curr->content, pd->backclip); 122 efl_canvas_object_clipper_set(curr->content, pd->backclip);
123 123
124 curr->content_num = -1; 124 curr->content_num = -1;
125 curr->content = NULL; 125 curr->content = NULL;
@@ -140,10 +140,10 @@ _page_info_geometry_change(Efl_Page_Transition_Scroll_Data *pd,
140 { 140 {
141 tmp = efl_pack_content_get(spd->pager.obj, tmp_id); 141 tmp = efl_pack_content_get(spd->pager.obj, tmp_id);
142 142
143 efl_canvas_object_clip_set(curr->obj, pd->foreclip); 143 efl_canvas_object_clipper_set(curr->obj, pd->foreclip);
144 144
145 efl_pack(curr->obj, tmp); 145 efl_pack(curr->obj, tmp);
146 efl_canvas_object_clip_set(tmp, pd->foreclip); 146 efl_canvas_object_clipper_set(tmp, pd->foreclip);
147 147
148 curr->content_num = tmp_id; 148 curr->content_num = tmp_id;
149 curr->content = tmp; 149 curr->content = tmp;
@@ -152,10 +152,10 @@ _page_info_geometry_change(Efl_Page_Transition_Scroll_Data *pd,
152 } 152 }
153 else if (curr->content) 153 else if (curr->content)
154 { 154 {
155 efl_canvas_object_clip_set(curr->obj, pd->backclip); 155 efl_canvas_object_clipper_set(curr->obj, pd->backclip);
156 156
157 efl_pack_unpack(curr->obj, curr->content); 157 efl_pack_unpack(curr->obj, curr->content);
158 efl_canvas_object_clip_set(curr->content, pd->backclip); 158 efl_canvas_object_clipper_set(curr->content, pd->backclip);
159 159
160 curr->content_num = -1; 160 curr->content_num = -1;
161 curr->content = NULL; 161 curr->content = NULL;
@@ -249,7 +249,7 @@ _efl_page_transition_scroll_efl_page_transition_bind(Eo *obj,
249 for (i = 0; i < cnt; i++) 249 for (i = 0; i < cnt; i++)
250 { 250 {
251 item = efl_pack_content_get(spd->pager.obj, i); 251 item = efl_pack_content_get(spd->pager.obj, i);
252 efl_canvas_object_clip_set(item, pd->backclip); 252 efl_canvas_object_clipper_set(item, pd->backclip);
253 } 253 }
254 _page_info_allocate(pd, spd); 254 _page_info_allocate(pd, spd);
255 _page_info_geometry_change(pd, spd); 255 _page_info_geometry_change(pd, spd);
@@ -314,9 +314,9 @@ _efl_page_transition_scroll_update(Eo *obj,
314 314
315 if (dummy->visible) 315 if (dummy->visible)
316 { 316 {
317 efl_canvas_object_clip_set(dummy->obj, pd->backclip); 317 efl_canvas_object_clipper_set(dummy->obj, pd->backclip);
318 efl_pack_unpack(dummy->obj, dummy->content); 318 efl_pack_unpack(dummy->obj, dummy->content);
319 efl_canvas_object_clip_set(dummy->content, pd->backclip); 319 efl_canvas_object_clipper_set(dummy->content, pd->backclip);
320 320
321 dummy->content_num = -1; 321 dummy->content_num = -1;
322 dummy->content = NULL; 322 dummy->content = NULL;
@@ -340,10 +340,10 @@ _efl_page_transition_scroll_update(Eo *obj,
340 { 340 {
341 if (curr->visible) 341 if (curr->visible)
342 { 342 {
343 efl_canvas_object_clip_set(curr->obj, pd->backclip); 343 efl_canvas_object_clipper_set(curr->obj, pd->backclip);
344 344
345 efl_pack_unpack(curr->obj, curr->content); 345 efl_pack_unpack(curr->obj, curr->content);
346 efl_canvas_object_clip_set(curr->content, pd->backclip); 346 efl_canvas_object_clipper_set(curr->content, pd->backclip);
347 347
348 curr->content_num = -1; 348 curr->content_num = -1;
349 curr->content = NULL; 349 curr->content = NULL;
@@ -367,13 +367,13 @@ _efl_page_transition_scroll_update(Eo *obj,
367 if (curr->content) 367 if (curr->content)
368 { 368 {
369 efl_pack_unpack(curr->obj, curr->content); 369 efl_pack_unpack(curr->obj, curr->content);
370 efl_canvas_object_clip_set(curr->content, pd->backclip); 370 efl_canvas_object_clipper_set(curr->content, pd->backclip);
371 } 371 }
372 372
373 efl_canvas_object_clip_set(curr->obj, pd->foreclip); 373 efl_canvas_object_clipper_set(curr->obj, pd->foreclip);
374 374
375 efl_pack(curr->obj, tmp); 375 efl_pack(curr->obj, tmp);
376 efl_canvas_object_clip_set(tmp, pd->foreclip); 376 efl_canvas_object_clipper_set(tmp, pd->foreclip);
377 377
378 curr->content_num = tmp_id; 378 curr->content_num = tmp_id;
379 curr->content = tmp; 379 curr->content = tmp;
@@ -382,10 +382,10 @@ _efl_page_transition_scroll_update(Eo *obj,
382 } 382 }
383 else if (curr->content) 383 else if (curr->content)
384 { 384 {
385 efl_canvas_object_clip_set(curr->obj, pd->backclip); 385 efl_canvas_object_clipper_set(curr->obj, pd->backclip);
386 386
387 efl_pack_unpack(curr->obj, curr->content); 387 efl_pack_unpack(curr->obj, curr->content);
388 efl_canvas_object_clip_set(curr->content, pd->backclip); 388 efl_canvas_object_clipper_set(curr->content, pd->backclip);
389 389
390 curr->content_num = -1; 390 curr->content_num = -1;
391 curr->content = NULL; 391 curr->content = NULL;
@@ -480,7 +480,7 @@ _add_item(Efl_Page_Transition_Scroll_Data *pd, Efl_Page_Transition_Data *spd)
480static void 480static void
481_remove_item(Page_Info *pi, Efl_Page_Transition_Scroll_Data *pd) 481_remove_item(Page_Info *pi, Efl_Page_Transition_Scroll_Data *pd)
482{ 482{
483 efl_canvas_object_clip_set(pi->content, pd->backclip); 483 efl_canvas_object_clipper_set(pi->content, pd->backclip);
484 efl_pack_unpack(pi->obj, pi->content); 484 efl_pack_unpack(pi->obj, pi->content);
485 efl_del(pi->obj); 485 efl_del(pi->obj);
486 pi->prev->next = pi->next; 486 pi->prev->next = pi->next;
@@ -583,7 +583,7 @@ _efl_page_transition_scroll_loop_set(Eo *obj,
583 tmp = efl_pack_content_get(spd->pager.obj, tmp_id); 583 tmp = efl_pack_content_get(spd->pager.obj, tmp_id);
584 584
585 efl_pack(curr->obj, tmp); 585 efl_pack(curr->obj, tmp);
586 efl_canvas_object_clip_set(tmp, pd->foreclip); 586 efl_canvas_object_clipper_set(tmp, pd->foreclip);
587 587
588 curr->content_num = tmp_id; 588 curr->content_num = tmp_id;
589 curr->content = tmp; 589 curr->content = tmp;
@@ -593,7 +593,7 @@ _efl_page_transition_scroll_loop_set(Eo *obj,
593 593
594 case EFL_UI_PAGER_LOOP_DISABLED: 594 case EFL_UI_PAGER_LOOP_DISABLED:
595 efl_pack_unpack(curr->obj, curr->content); 595 efl_pack_unpack(curr->obj, curr->content);
596 efl_canvas_object_clip_set(curr->content, pd->backclip); 596 efl_canvas_object_clipper_set(curr->content, pd->backclip);
597 597
598 curr->content_num = -1; 598 curr->content_num = -1;
599 curr->content = NULL; 599 curr->content = NULL;
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index d4089edd1f..479f1e4d4a 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -81,8 +81,8 @@ static void
81_recover_status(Eo *obj, Efl_Ui_Image_Data *sd) 81_recover_status(Eo *obj, Efl_Ui_Image_Data *sd)
82{ 82{
83 int r, g, b, a; 83 int r, g, b, a;
84 Evas_Object *pclip = efl_canvas_object_clip_get(obj); 84 Evas_Object *pclip = efl_canvas_object_clipper_get(obj);
85 if (pclip) efl_canvas_object_clip_set(sd->img, pclip); 85 if (pclip) efl_canvas_object_clipper_set(sd->img, pclip);
86 86
87 efl_gfx_color_get(obj, &r, &g, &b, &a); 87 efl_gfx_color_get(obj, &r, &g, &b, &a);
88 efl_gfx_color_set(sd->img, r, g, b, a); 88 efl_gfx_color_set(sd->img, r, g, b, a);
@@ -706,12 +706,12 @@ _efl_ui_image_efl_gfx_color_color_set(Eo *obj, Efl_Ui_Image_Data *sd, int r, int
706} 706}
707 707
708EOLIAN static void 708EOLIAN static void
709_efl_ui_image_efl_canvas_object_clip_set(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *clip) 709_efl_ui_image_efl_canvas_object_clipper_set(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *clip)
710{ 710{
711 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_CLIP_SET, 0, clip)) 711 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_CLIP_SET, 0, clip))
712 return; 712 return;
713 713
714 efl_canvas_object_clip_set(efl_super(obj, MY_CLASS), clip); 714 efl_canvas_object_clipper_set(efl_super(obj, MY_CLASS), clip);
715 715
716 if (sd->img) evas_object_clip_set(sd->img, clip); 716 if (sd->img) evas_object_clip_set(sd->img, clip);
717 if (sd->prev_img) evas_object_clip_set(sd->prev_img, clip); 717 if (sd->prev_img) evas_object_clip_set(sd->prev_img, clip);
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index 109ef76d57..688a9479d9 100644
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -115,7 +115,7 @@ class @beta Efl.Ui.Image extends Efl.Ui.Widget implements Efl.Ui.Clickable, Efl.
115 Efl.Layout.Calc.calc_size_min; 115 Efl.Layout.Calc.calc_size_min;
116 Efl.Layout.Calc.calc_parts_extends; 116 Efl.Layout.Calc.calc_parts_extends;
117 Efl.Layout.Calc.calc_force; 117 Efl.Layout.Calc.calc_force;
118 Efl.Canvas.Object.clip { set; } 118 Efl.Canvas.Object.clipper { set; }
119 Efl.Canvas.Group.group_member_add; 119 Efl.Canvas.Group.group_member_add;
120 Efl.Ui.Draggable.drag_target { get; set; } 120 Efl.Ui.Draggable.drag_target { get; set; }
121 Efl.Ui.Property_Bind.property_bind; 121 Efl.Ui.Property_Bind.property_bind;
diff --git a/src/lib/elementary/efl_ui_pager.c b/src/lib/elementary/efl_ui_pager.c
index d97bea8ad9..cacdac5c4b 100644
--- a/src/lib/elementary/efl_ui_pager.c
+++ b/src/lib/elementary/efl_ui_pager.c
@@ -366,7 +366,7 @@ _efl_ui_pager_efl_object_constructor(Eo *obj,
366 evas_object_evas_get(obj)); 366 evas_object_evas_get(obj));
367 efl_canvas_group_member_add(pd->page_root, pd->foreclip); 367 efl_canvas_group_member_add(pd->page_root, pd->foreclip);
368 evas_object_static_clip_set(pd->foreclip, EINA_TRUE); 368 evas_object_static_clip_set(pd->foreclip, EINA_TRUE);
369 efl_canvas_object_clip_set(pd->page_box, pd->foreclip); 369 efl_canvas_object_clipper_set(pd->page_box, pd->foreclip);
370 370
371 pd->backclip = efl_add(EFL_CANVAS_RECTANGLE_CLASS, 371 pd->backclip = efl_add(EFL_CANVAS_RECTANGLE_CLASS,
372 evas_object_evas_get(obj)); 372 evas_object_evas_get(obj));
@@ -402,7 +402,7 @@ _efl_ui_pager_efl_pack_linear_pack_begin(Eo *obj EINA_UNUSED,
402 { 402 {
403 if (pd->cnt == 1) 403 if (pd->cnt == 1)
404 efl_pack(pd->page_box, subobj); 404 efl_pack(pd->page_box, subobj);
405 else efl_canvas_object_clip_set(subobj, pd->backclip); 405 else efl_canvas_object_clipper_set(subobj, pd->backclip);
406 } 406 }
407 407
408 if (pd->indicator) 408 if (pd->indicator)
@@ -429,7 +429,7 @@ _efl_ui_pager_efl_pack_linear_pack_end(Eo *obj EINA_UNUSED,
429 { 429 {
430 if (pd->cnt == 1) 430 if (pd->cnt == 1)
431 efl_pack(pd->page_box, subobj); 431 efl_pack(pd->page_box, subobj);
432 else efl_canvas_object_clip_set(subobj, pd->backclip); 432 else efl_canvas_object_clipper_set(subobj, pd->backclip);
433 } 433 }
434 434
435 if (pd->indicator) 435 if (pd->indicator)
@@ -456,7 +456,7 @@ _efl_ui_pager_efl_pack_linear_pack_before(Eo *obj EINA_UNUSED,
456 456
457 if (pd->transition) 457 if (pd->transition)
458 efl_page_transition_update(pd->transition, pd->curr.pos); 458 efl_page_transition_update(pd->transition, pd->curr.pos);
459 else efl_canvas_object_clip_set(subobj, pd->backclip); 459 else efl_canvas_object_clipper_set(subobj, pd->backclip);
460 460
461 if (pd->indicator) 461 if (pd->indicator)
462 efl_page_indicator_pack(pd->indicator, index); 462 efl_page_indicator_pack(pd->indicator, index);
@@ -482,7 +482,7 @@ _efl_ui_pager_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED,
482 482
483 if (pd->transition) 483 if (pd->transition)
484 efl_page_transition_update(pd->transition, pd->curr.pos); 484 efl_page_transition_update(pd->transition, pd->curr.pos);
485 else efl_canvas_object_clip_set(subobj, pd->backclip); 485 else efl_canvas_object_clipper_set(subobj, pd->backclip);
486 486
487 if (pd->indicator) 487 if (pd->indicator)
488 efl_page_indicator_pack(pd->indicator, (index + 1)); 488 efl_page_indicator_pack(pd->indicator, (index + 1));
@@ -519,7 +519,7 @@ _efl_ui_pager_efl_pack_linear_pack_at(Eo *obj,
519 519
520 if (pd->transition) 520 if (pd->transition)
521 efl_page_transition_update(pd->transition, pd->curr.pos); 521 efl_page_transition_update(pd->transition, pd->curr.pos);
522 else efl_canvas_object_clip_set(subobj, pd->backclip); 522 else efl_canvas_object_clipper_set(subobj, pd->backclip);
523 523
524 if (pd->indicator) 524 if (pd->indicator)
525 efl_page_indicator_pack(pd->indicator, index); 525 efl_page_indicator_pack(pd->indicator, index);
@@ -566,7 +566,7 @@ _efl_ui_pager_current_page_set(Eo *obj,
566 566
567 curr = eina_list_nth(pd->content_list, pd->curr.page); 567 curr = eina_list_nth(pd->content_list, pd->curr.page);
568 efl_pack_unpack(pd->page_box, curr); 568 efl_pack_unpack(pd->page_box, curr);
569 efl_canvas_object_clip_set(curr, pd->backclip); 569 efl_canvas_object_clipper_set(curr, pd->backclip);
570 570
571 pd->curr.page = index; 571 pd->curr.page = index;
572 curr = eina_list_nth(pd->content_list, pd->curr.page); 572 curr = eina_list_nth(pd->content_list, pd->curr.page);
@@ -611,7 +611,7 @@ _efl_ui_pager_transition_set(Eo *obj,
611 611
612 curr = eina_list_nth(pd->content_list, pd->curr.page); 612 curr = eina_list_nth(pd->content_list, pd->curr.page);
613 efl_pack_unpack(pd->page_box, curr); 613 efl_pack_unpack(pd->page_box, curr);
614 efl_canvas_object_clip_set(pd->page_box, pd->backclip); 614 efl_canvas_object_clipper_set(pd->page_box, pd->backclip);
615 } 615 }
616 616
617 pd->transition = transition; 617 pd->transition = transition;
@@ -628,11 +628,11 @@ _efl_ui_pager_transition_set(Eo *obj,
628 628
629 _event_handler_del(obj, pd); 629 _event_handler_del(obj, pd);
630 630
631 efl_canvas_object_clip_set(pd->page_box, pd->foreclip); 631 efl_canvas_object_clipper_set(pd->page_box, pd->foreclip);
632 632
633 EINA_LIST_FOREACH(pd->content_list, list, curr) 633 EINA_LIST_FOREACH(pd->content_list, list, curr)
634 { 634 {
635 efl_canvas_object_clip_set(curr, pd->backclip); 635 efl_canvas_object_clipper_set(curr, pd->backclip);
636 } 636 }
637 637
638 curr = eina_list_nth(pd->content_list, pd->curr.page); 638 curr = eina_list_nth(pd->content_list, pd->curr.page);
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 57c29784a8..c6655ac93d 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -3739,7 +3739,7 @@ _anchors_update(Eo *obj, Efl_Ui_Text_Data *sd)
3739 { 3739 {
3740 efl_canvas_group_member_add(smart, ob); 3740 efl_canvas_group_member_add(smart, ob);
3741 efl_gfx_stack_above(ob, obj); 3741 efl_gfx_stack_above(ob, obj);
3742 efl_canvas_object_clip_set(ob, clip); 3742 efl_canvas_object_clipper_set(ob, clip);
3743 efl_canvas_object_pass_events_set(ob, EINA_TRUE); 3743 efl_canvas_object_pass_events_set(ob, EINA_TRUE);
3744 rect->obj = ob; 3744 rect->obj = ob;
3745 } 3745 }
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index a101040b86..3c6b429dfe 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -1021,7 +1021,7 @@ _efl_ui_widget_efl_canvas_object_is_frame_object_set(Eo *obj, Elm_Widget_Smart_D
1021} 1021}
1022 1022
1023EOLIAN static void 1023EOLIAN static void
1024_efl_ui_widget_efl_canvas_object_clip_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *clip) 1024_efl_ui_widget_efl_canvas_object_clipper_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *clip)
1025{ 1025{
1026 Eina_Iterator *it; 1026 Eina_Iterator *it;
1027 Evas_Object *o; 1027 Evas_Object *o;
@@ -1029,7 +1029,7 @@ _efl_ui_widget_efl_canvas_object_clip_set(Eo *obj, Elm_Widget_Smart_Data *_pd EI
1029 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_CLIP_SET, 0, clip)) 1029 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_CLIP_SET, 0, clip))
1030 return; 1030 return;
1031 1031
1032 efl_canvas_object_clip_set(efl_super(obj, MY_CLASS), clip); 1032 efl_canvas_object_clipper_set(efl_super(obj, MY_CLASS), clip);
1033 1033
1034 it = evas_object_smart_iterator_new(obj); 1034 it = evas_object_smart_iterator_new(obj);
1035 EINA_ITERATOR_FOREACH(it, o) 1035 EINA_ITERATOR_FOREACH(it, o)
@@ -5870,7 +5870,7 @@ _widget_shadow_update(Widget_Shadow *ws)
5870 return; 5870 return;
5871 } 5871 }
5872 5872
5873 efl_canvas_object_clip_set(ws->surface, efl_canvas_object_clip_get(ws->widget)); 5873 efl_canvas_object_clipper_set(ws->surface, efl_canvas_object_clipper_get(ws->widget));
5874 efl_canvas_group_member_add(efl_canvas_object_render_parent_get(ws->widget), ws->surface); 5874 efl_canvas_group_member_add(efl_canvas_object_render_parent_get(ws->widget), ws->surface);
5875 efl_gfx_entity_geometry_set(ws->surface, srect); 5875 efl_gfx_entity_geometry_set(ws->surface, srect);
5876 efl_gfx_stack_below(ws->surface, ws->widget); 5876 efl_gfx_stack_below(ws->surface, ws->widget);
diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo
index 15de2ce24b..09e2303f11 100644
--- a/src/lib/elementary/efl_ui_widget.eo
+++ b/src/lib/elementary/efl_ui_widget.eo
@@ -625,7 +625,7 @@ abstract @beta Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Obje
625 Efl.Gfx.Entity.position { set; } 625 Efl.Gfx.Entity.position { set; }
626 Efl.Gfx.Entity.size { set; } 626 Efl.Gfx.Entity.size { set; }
627 Efl.Gfx.Entity.scale { set; get; } 627 Efl.Gfx.Entity.scale { set; get; }
628 Efl.Canvas.Object.clip { set; } 628 Efl.Canvas.Object.clipper { set; }
629 Efl.Canvas.Object.no_render { set; } 629 Efl.Canvas.Object.no_render { set; }
630 Efl.Canvas.Group.group_calculate; 630 Efl.Canvas.Group.group_calculate;
631 Efl.Canvas.Group.group_member_remove; 631 Efl.Canvas.Group.group_member_remove;
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 57f9ec1a65..22b2d0c135 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -2130,6 +2130,19 @@ EAPI void evas_object_static_clip_set(Evas_Object *obj, Eina_Bool is_static_clip
2130 */ 2130 */
2131EAPI const Eina_List *evas_object_clipees_get(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT; 2131EAPI const Eina_List *evas_object_clipees_get(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT;
2132 2132
2133/**
2134 * @brief Test if any object is clipped by @c obj.
2135 *
2136 * @param[in] obj The object.
2137 *
2138 * @return @c true if any object is clipped by @c obj, @c false otherwise
2139 *
2140 * @since 1.8
2141 *
2142 * @ingroup Evas_Object
2143 */
2144EAPI Eina_Bool evas_object_clipees_has(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT;
2145
2133/** How the object should be rendered to output. 2146/** How the object should be rendered to output.
2134 * 2147 *
2135 * @ingroup Evas 2148 * @ingroup Evas
diff --git a/src/lib/evas/canvas/efl_canvas_group.eo b/src/lib/evas/canvas/efl_canvas_group.eo
index 2602729f44..c89b6d1f4a 100644
--- a/src/lib/evas/canvas/efl_canvas_group.eo
+++ b/src/lib/evas/canvas/efl_canvas_group.eo
@@ -136,7 +136,7 @@ class @beta Efl.Canvas.Group extends Efl.Canvas.Object
136 Efl.Gfx.Color.color { set; } 136 Efl.Gfx.Color.color { set; }
137 Efl.Gfx.Entity.visible { set; } 137 Efl.Gfx.Entity.visible { set; }
138 Efl.Gfx.Entity.position { set; } 138 Efl.Gfx.Entity.position { set; }
139 Efl.Canvas.Object.clip { set; } 139 Efl.Canvas.Object.clipper { set; }
140 Efl.Canvas.Object.no_render { set; } 140 Efl.Canvas.Object.no_render { set; }
141 Efl.Canvas.Object.paragraph_direction { get; set; } 141 Efl.Canvas.Object.paragraph_direction { get; set; }
142 } 142 }
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index e97c0195a3..0390f92c13 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -86,7 +86,7 @@ abstract @beta Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.En
86 render_op: Efl.Gfx.Render_Op; [[Blend or copy.]] 86 render_op: Efl.Gfx.Render_Op; [[Blend or copy.]]
87 } 87 }
88 } 88 }
89 @property clip { 89 @property clipper {
90 set { 90 set {
91 [[Clip one object to another. 91 [[Clip one object to another.
92 92
@@ -128,6 +128,7 @@ abstract @beta Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.En
128 Note: Only rectangle and image (masks) objects can be used 128 Note: Only rectangle and image (masks) objects can be used
129 as clippers. Anything else will result in undefined behaviour. 129 as clippers. Anything else will result in undefined behaviour.
130 ]] 130 ]]
131 legacy: evas_object_clip_set;
131 } 132 }
132 get { 133 get {
133 [[Get the object clipping $obj (if any). 134 [[Get the object clipping $obj (if any).
@@ -136,9 +137,10 @@ abstract @beta Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.En
136 not being clipped at all, $null is returned. The object $obj 137 not being clipped at all, $null is returned. The object $obj
137 must be a valid Evas_Object. 138 must be a valid Evas_Object.
138 ]] 139 ]]
140 legacy: evas_object_clip_get;
139 } 141 }
140 values { 142 values {
141 clip: Efl.Canvas.Object @nonull; [[The object to clip $obj by.]] 143 clipper: Efl.Canvas.Object @nonull; [[The object to clip $obj by.]]
142 } 144 }
143 } 145 }
144 @property repeat_events { 146 @property repeat_events {
@@ -348,7 +350,7 @@ abstract @beta Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.En
348 $false otherwise.]] 350 $false otherwise.]]
349 } 351 }
350 } 352 }
351 @property clipees { 353 @property clipped_objects {
352 get { 354 get {
353 [[Return a list of objects currently clipped by $obj. 355 [[Return a list of objects currently clipped by $obj.
354 356
@@ -363,7 +365,7 @@ abstract @beta Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.En
363 anymore after that point. Any use of the list after this 365 anymore after that point. Any use of the list after this
364 may have undefined results, possibly leading to crashes. 366 may have undefined results, possibly leading to crashes.
365 367
366 See also @.clip. 368 See also @.clipper.
367 ]] 369 ]]
368 legacy: null; 370 legacy: null;
369 return: iterator<Efl.Canvas.Object> @warn_unused; [[An iterator over the 371 return: iterator<Efl.Canvas.Object> @warn_unused; [[An iterator over the
@@ -396,12 +398,11 @@ abstract @beta Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.En
396 dir: Efl.Text_Bidirectional_Type; [[Paragraph direction for the given object.]] 398 dir: Efl.Text_Bidirectional_Type; [[Paragraph direction for the given object.]]
397 } 399 }
398 } 400 }
399 clipees_has @const { 401 clipped_objects_count @const {
400 [[Test if any object is clipped by $obj. 402 [[Returns the number of objects clipped by $obj
401
402 @since 1.8
403 ]] 403 ]]
404 return: bool @warn_unused; [[$true if any object is clipped by $obj, $false otherwise]] 404 legacy: null;
405 return: uint @warn_unused; [[The number of objects clipped by $obj]]
405 } 406 }
406 key_grab { 407 key_grab {
407 /* FIXME: can't reference Eolian object, .eo file not being installed */ 408 /* FIXME: can't reference Eolian object, .eo file not being installed */
diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index 27ed00e604..3678d4aa82 100644
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -190,7 +190,7 @@ evas_object_mapped_clip_across_mark(Evas_Object *eo_obj, Evas_Object_Protected_D
190} 190}
191 191
192static void 192static void
193_efl_canvas_object_clip_mask_unset(Evas_Object_Protected_Data *obj) 193_efl_canvas_object_clipper_mask_unset(Evas_Object_Protected_Data *obj)
194{ 194{
195 EVAS_OBJECT_DATA_VALID_CHECK(obj); 195 EVAS_OBJECT_DATA_VALID_CHECK(obj);
196 if (!obj->mask->is_mask) return; 196 if (!obj->mask->is_mask) return;
@@ -218,7 +218,7 @@ extern const char *o_image_type;
218static void _clipper_invalidated_cb(void *data, const Efl_Event *event); 218static void _clipper_invalidated_cb(void *data, const Efl_Event *event);
219 219
220Eina_Bool 220Eina_Bool
221_efl_canvas_object_clip_set_block(Eo *eo_obj, Evas_Object_Protected_Data *obj, 221_efl_canvas_object_clipper_set_block(Eo *eo_obj, Evas_Object_Protected_Data *obj,
222 Evas_Object *eo_clip, Evas_Object_Protected_Data *clip) 222 Evas_Object *eo_clip, Evas_Object_Protected_Data *clip)
223{ 223{
224 if (!obj) obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 224 if (!obj) obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
@@ -259,7 +259,7 @@ err_type:
259} 259}
260 260
261static inline void 261static inline void
262_efl_canvas_object_clip_unset_common(Evas_Object_Protected_Data *obj, Eina_Bool warn) 262_efl_canvas_object_clipper_unset_common(Evas_Object_Protected_Data *obj, Eina_Bool warn)
263{ 263{
264 Evas_Object_Protected_Data *clip = obj->cur->clipper; 264 Evas_Object_Protected_Data *clip = obj->cur->clipper;
265 265
@@ -302,7 +302,7 @@ _efl_canvas_object_clip_unset_common(Evas_Object_Protected_Data *obj, Eina_Bool
302 } 302 }
303 } 303 }
304 304
305 _efl_canvas_object_clip_mask_unset(clip); 305 _efl_canvas_object_clipper_mask_unset(clip);
306 } 306 }
307 evas_object_change(clip->object, clip); 307 evas_object_change(clip->object, clip);
308 if (obj->prev->clipper != clip) 308 if (obj->prev->clipper != clip)
@@ -315,7 +315,7 @@ _efl_canvas_object_clip_unset_common(Evas_Object_Protected_Data *obj, Eina_Bool
315} 315}
316 316
317EOLIAN void 317EOLIAN void
318_efl_canvas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_clip) 318_efl_canvas_object_clipper_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_clip)
319{ 319{
320 Evas_Object_Protected_Data *clip; 320 Evas_Object_Protected_Data *clip;
321 321
@@ -331,7 +331,7 @@ _efl_canvas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Ob
331 return; 331 return;
332 } 332 }
333 333
334 if (_efl_canvas_object_clip_set_block(eo_obj, obj, eo_clip, clip)) return; 334 if (_efl_canvas_object_clipper_set_block(eo_obj, obj, eo_clip, clip)) return;
335 if (_evas_object_intercept_call_evas(obj, EVAS_OBJECT_INTERCEPT_CB_CLIP_SET, 1, eo_clip)) return; 335 if (_evas_object_intercept_call_evas(obj, EVAS_OBJECT_INTERCEPT_CB_CLIP_SET, 1, eo_clip)) return;
336 336
337 if (obj->is_smart && obj->smart.smart && obj->smart.smart->smart_class && 337 if (obj->is_smart && obj->smart.smart && obj->smart.smart->smart_class &&
@@ -341,7 +341,7 @@ _efl_canvas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Ob
341 } 341 }
342 342
343 /* unset cur clipper */ 343 /* unset cur clipper */
344 _efl_canvas_object_clip_unset_common(obj, EINA_TRUE); 344 _efl_canvas_object_clipper_unset_common(obj, EINA_TRUE);
345 345
346 /* image object clipper */ 346 /* image object clipper */
347 if (clip->type == o_image_type) 347 if (clip->type == o_image_type)
@@ -391,7 +391,7 @@ _efl_canvas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Ob
391} 391}
392 392
393EOLIAN Evas_Object * 393EOLIAN Evas_Object *
394_efl_canvas_object_clip_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) 394_efl_canvas_object_clipper_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
395{ 395{
396 EVAS_OBJECT_DATA_ALIVE_CHECK(obj, NULL); 396 EVAS_OBJECT_DATA_ALIVE_CHECK(obj, NULL);
397 if (obj->cur->clipper) 397 if (obj->cur->clipper)
@@ -400,7 +400,7 @@ _efl_canvas_object_clip_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_
400} 400}
401 401
402Eina_Bool 402Eina_Bool
403_efl_canvas_object_clip_unset_block(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) 403_efl_canvas_object_clipper_unset_block(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
404{ 404{
405 if (!obj->cur->clipper) 405 if (!obj->cur->clipper)
406 return EINA_TRUE; 406 return EINA_TRUE;
@@ -414,14 +414,14 @@ _efl_canvas_object_clip_unset_block(Eo *eo_obj EINA_UNUSED, Evas_Object_Protecte
414static void 414static void
415_clip_unset(Eo *eo_obj, Evas_Object_Protected_Data *obj) 415_clip_unset(Eo *eo_obj, Evas_Object_Protected_Data *obj)
416{ 416{
417 if (_efl_canvas_object_clip_unset_block(eo_obj, obj)) return; 417 if (_efl_canvas_object_clipper_unset_block(eo_obj, obj)) return;
418 if (_evas_object_intercept_call_evas(obj, EVAS_OBJECT_INTERCEPT_CB_CLIP_SET, 1, NULL)) return; 418 if (_evas_object_intercept_call_evas(obj, EVAS_OBJECT_INTERCEPT_CB_CLIP_SET, 1, NULL)) return;
419 if (obj->is_smart && obj->smart.smart && obj->smart.smart->smart_class && 419 if (obj->is_smart && obj->smart.smart && obj->smart.smart->smart_class &&
420 obj->smart.smart->smart_class->clip_unset) 420 obj->smart.smart->smart_class->clip_unset)
421 { 421 {
422 obj->smart.smart->smart_class->clip_unset(eo_obj); 422 obj->smart.smart->smart_class->clip_unset(eo_obj);
423 } 423 }
424 _efl_canvas_object_clip_unset_common(obj, EINA_FALSE); 424 _efl_canvas_object_clipper_unset_common(obj, EINA_FALSE);
425 evas_object_update_bounding_box(eo_obj, obj, NULL); 425 evas_object_update_bounding_box(eo_obj, obj, NULL);
426 evas_object_change(eo_obj, obj); 426 evas_object_change(eo_obj, obj);
427 evas_object_clip_dirty(eo_obj, obj); 427 evas_object_clip_dirty(eo_obj, obj);
@@ -469,7 +469,7 @@ _clipper_invalidated_cb(void *data, const Efl_Event *event)
469} 469}
470 470
471void 471void
472_efl_canvas_object_clip_prev_reset(Evas_Object_Protected_Data *obj, Eina_Bool cur_prev) 472_efl_canvas_object_clipper_prev_reset(Evas_Object_Protected_Data *obj, Eina_Bool cur_prev)
473{ 473{
474 if (obj->prev->clipper) 474 if (obj->prev->clipper)
475 { 475 {
@@ -502,6 +502,13 @@ evas_object_clipees_get(const Evas_Object *eo_obj)
502 return answer; 502 return answer;
503} 503}
504 504
505EAPI Eina_Bool
506evas_object_clipees_has(const Evas_Object *eo_obj)
507{
508 Evas_Object_Protected_Data *obj = EVAS_OBJ_GET_OR_RETURN(eo_obj, EINA_FALSE);
509 return !!obj->clip.clipees;
510}
511
505typedef struct 512typedef struct
506{ 513{
507 Eina_Iterator iterator; 514 Eina_Iterator iterator;
@@ -536,7 +543,7 @@ _clipee_iterator_free(Clipee_Iterator *it)
536} 543}
537 544
538EOLIAN Eina_Iterator * 545EOLIAN Eina_Iterator *
539_efl_canvas_object_clipees_get(const Eo *eo_obj, Evas_Object_Protected_Data *obj) 546_efl_canvas_object_clipped_objects_get(const Eo *eo_obj, Evas_Object_Protected_Data *obj)
540{ 547{
541 Clipee_Iterator *it; 548 Clipee_Iterator *it;
542 549
@@ -556,10 +563,10 @@ _efl_canvas_object_clipees_get(const Eo *eo_obj, Evas_Object_Protected_Data *obj
556 return &it->iterator; 563 return &it->iterator;
557} 564}
558 565
559EOLIAN Eina_Bool 566EOLIAN unsigned int
560_efl_canvas_object_clipees_has(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) 567_efl_canvas_object_clipped_objects_count(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
561{ 568{
562 return (obj->clip.clipees ? EINA_TRUE : EINA_FALSE); 569 return eina_list_count(obj->clip.clipees);
563} 570}
564 571
565EOLIAN void 572EOLIAN void
diff --git a/src/lib/evas/canvas/evas_object_intercept.c b/src/lib/evas/canvas/evas_object_intercept.c
index cc4232b3df..2f45448823 100644
--- a/src/lib/evas/canvas/evas_object_intercept.c
+++ b/src/lib/evas/canvas/evas_object_intercept.c
@@ -194,7 +194,7 @@ _evas_object_intercept_call_internal(Evas_Object *eo_obj,
194 { 194 {
195 if (!internal) 195 if (!internal)
196 { 196 {
197 if (_efl_canvas_object_clip_set_block(eo_obj, obj, eo_other, NULL)) 197 if (_efl_canvas_object_clipper_set_block(eo_obj, obj, eo_other, NULL))
198 return 1; 198 return 1;
199 } 199 }
200 if (!obj->interceptors) return 0; 200 if (!obj->interceptors) return 0;
@@ -204,7 +204,7 @@ _evas_object_intercept_call_internal(Evas_Object *eo_obj,
204 { 204 {
205 if (!internal) 205 if (!internal)
206 { 206 {
207 if (_efl_canvas_object_clip_unset_block(eo_obj, obj)) 207 if (_efl_canvas_object_clipper_unset_block(eo_obj, obj))
208 return 1; 208 return 1;
209 } 209 }
210 if (!obj->interceptors) return 0; 210 if (!obj->interceptors) return 0;
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index f26744baf4..d97b833cd7 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -422,7 +422,7 @@ evas_object_cur_prev(Evas_Object_Protected_Data *obj)
422 map_write->prev = map_write->cur; 422 map_write->prev = map_write->cur;
423 EINA_COW_WRITE_END(evas_object_map_cow, obj->map, map_write); 423 EINA_COW_WRITE_END(evas_object_map_cow, obj->map, map_write);
424 } 424 }
425 _efl_canvas_object_clip_prev_reset(obj, EINA_TRUE); 425 _efl_canvas_object_clipper_prev_reset(obj, EINA_TRUE);
426 eina_cow_memcpy(evas_object_state_cow, (const Eina_Cow_Data **) &obj->prev, obj->cur); 426 eina_cow_memcpy(evas_object_state_cow, (const Eina_Cow_Data **) &obj->prev, obj->cur);
427} 427}
428 428
@@ -1095,7 +1095,7 @@ _efl_canvas_object_efl_object_invalidate(Eo *eo_obj, Evas_Object_Protected_Data
1095 } 1095 }
1096 1096
1097 if (obj->cur && obj->cur->clipper) evas_object_clip_unset(eo_obj); 1097 if (obj->cur && obj->cur->clipper) evas_object_clip_unset(eo_obj);
1098 if (obj->prev) _efl_canvas_object_clip_prev_reset(obj, EINA_FALSE); 1098 if (obj->prev) _efl_canvas_object_clipper_prev_reset(obj, EINA_FALSE);
1099 1099
1100 if (obj->map) evas_object_map_set(eo_obj, NULL); 1100 if (obj->map) evas_object_map_set(eo_obj, NULL);
1101 1101
@@ -2126,7 +2126,7 @@ _efl_canvas_object_efl_object_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Dat
2126 pass_event = efl_canvas_object_pass_events_get(eo_obj); 2126 pass_event = efl_canvas_object_pass_events_get(eo_obj);
2127 repeat_event = efl_canvas_object_repeat_events_get(eo_obj); 2127 repeat_event = efl_canvas_object_repeat_events_get(eo_obj);
2128 propagate_event = efl_canvas_object_propagate_events_get(eo_obj); 2128 propagate_event = efl_canvas_object_propagate_events_get(eo_obj);
2129 clipees_has = efl_canvas_object_clipees_has(eo_obj); 2129 clipees_has = evas_object_clipees_has(eo_obj);
2130 2130
2131 EFL_DBG_INFO_APPEND(group, "Visibility", EINA_VALUE_TYPE_CHAR, visible); 2131 EFL_DBG_INFO_APPEND(group, "Visibility", EINA_VALUE_TYPE_CHAR, visible);
2132 2132
@@ -2205,7 +2205,7 @@ _efl_canvas_object_efl_object_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Dat
2205 EFL_DBG_INFO_APPEND(group, "Has clipees", EINA_VALUE_TYPE_CHAR, clipees_has); 2205 EFL_DBG_INFO_APPEND(group, "Has clipees", EINA_VALUE_TYPE_CHAR, clipees_has);
2206 2206
2207 Evas_Object *clipper = NULL; 2207 Evas_Object *clipper = NULL;
2208 clipper = efl_canvas_object_clip_get(eo_obj); 2208 clipper = efl_canvas_object_clipper_get(eo_obj);
2209 EFL_DBG_INFO_APPEND(group, "Clipper", EINA_VALUE_TYPE_UINT64, (uintptr_t) clipper); 2209 EFL_DBG_INFO_APPEND(group, "Clipper", EINA_VALUE_TYPE_UINT64, (uintptr_t) clipper);
2210 2210
2211 const Evas_Map *map = evas_object_map_get(eo_obj); 2211 const Evas_Map *map = evas_object_map_get(eo_obj);
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 147e28526d..64f352ff88 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -307,7 +307,7 @@ _efl_canvas_group_group_member_add(Eo *smart_obj, Evas_Smart_Data *o, Evas_Objec
307 if (o->clipped) 307 if (o->clipped)
308 { 308 {
309 Evas_Object *clipper = _smart_clipper_get(o); 309 Evas_Object *clipper = _smart_clipper_get(o);
310 Eina_Bool had_clippees = efl_canvas_object_clipees_has(clipper); 310 Eina_Bool had_clippees = evas_object_clipees_has(clipper);
311 311
312 if (EINA_UNLIKELY(!clipper && !o->constructed)) 312 if (EINA_UNLIKELY(!clipper && !o->constructed))
313 { 313 {
@@ -318,7 +318,7 @@ _efl_canvas_group_group_member_add(Eo *smart_obj, Evas_Smart_Data *o, Evas_Objec
318 if (clipper != eo_obj) 318 if (clipper != eo_obj)
319 { 319 {
320 EINA_SAFETY_ON_NULL_RETURN(clipper); 320 EINA_SAFETY_ON_NULL_RETURN(clipper);
321 efl_canvas_object_clip_set(eo_obj, clipper); 321 efl_canvas_object_clipper_set(eo_obj, clipper);
322 if (!had_clippees && smart->cur->visible) 322 if (!had_clippees && smart->cur->visible)
323 efl_gfx_entity_visible_set(clipper, 1); 323 efl_gfx_entity_visible_set(clipper, 1);
324 } 324 }
@@ -369,8 +369,8 @@ _efl_canvas_group_group_member_remove(Eo *smart_obj, Evas_Smart_Data *_pd EINA_U
369 Evas_Object *clipper = _smart_clipper_get(o); 369 Evas_Object *clipper = _smart_clipper_get(o);
370 370
371 EINA_SAFETY_ON_NULL_RETURN(clipper); 371 EINA_SAFETY_ON_NULL_RETURN(clipper);
372 efl_canvas_object_clip_set(eo_obj, NULL); 372 efl_canvas_object_clipper_set(eo_obj, NULL);
373 if (!efl_canvas_object_clipees_has(clipper)) 373 if (!evas_object_clipees_has(clipper))
374 efl_gfx_entity_visible_set(clipper, 0); 374 efl_gfx_entity_visible_set(clipper, 0);
375 } 375 }
376 376
@@ -922,20 +922,20 @@ _efl_canvas_group_efl_gfx_entity_position_set(Eo *eo_obj, Evas_Smart_Data *o, Ei
922} 922}
923 923
924EOLIAN static void 924EOLIAN static void
925_efl_canvas_group_efl_canvas_object_clip_set(Eo *eo_obj, Evas_Smart_Data *o, Evas_Object *clip) 925_efl_canvas_group_efl_canvas_object_clipper_set(Eo *eo_obj, Evas_Smart_Data *o, Evas_Object *clip)
926{ 926{
927 EINA_SAFETY_ON_FALSE_RETURN(!clip || efl_isa(clip, EFL_CANVAS_OBJECT_CLASS)); 927 EINA_SAFETY_ON_FALSE_RETURN(!clip || efl_isa(clip, EFL_CANVAS_OBJECT_CLASS));
928 if (_evas_object_intercept_call(eo_obj, EVAS_OBJECT_INTERCEPT_CB_CLIP_SET, 0, clip)) 928 if (_evas_object_intercept_call(eo_obj, EVAS_OBJECT_INTERCEPT_CB_CLIP_SET, 0, clip))
929 return; 929 return;
930 930
931 efl_canvas_object_clip_set(efl_super(eo_obj, MY_CLASS), clip); 931 efl_canvas_object_clipper_set(efl_super(eo_obj, MY_CLASS), clip);
932 932
933 if (o->clipped) 933 if (o->clipped)
934 { 934 {
935 Evas_Object *clipper = _smart_clipper_get(o); 935 Evas_Object *clipper = _smart_clipper_get(o);
936 EINA_SAFETY_ON_NULL_RETURN(clipper); 936 EINA_SAFETY_ON_NULL_RETURN(clipper);
937 937
938 efl_canvas_object_clip_set(clipper, clip); 938 efl_canvas_object_clipper_set(clipper, clip);
939 } 939 }
940} 940}
941 941
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index e641b74063..208f0e1000 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1667,10 +1667,10 @@ void evas_font_draw_async_check(Evas_Object_Protected_Data *obj,
1667 int x, int y, int w, int h, int ow, int oh, 1667 int x, int y, int w, int h, int ow, int oh,
1668 Evas_Text_Props *intl_props, Eina_Bool do_async); 1668 Evas_Text_Props *intl_props, Eina_Bool do_async);
1669 1669
1670void _efl_canvas_object_clip_prev_reset(Evas_Object_Protected_Data *obj, Eina_Bool cur_prev); 1670void _efl_canvas_object_clipper_prev_reset(Evas_Object_Protected_Data *obj, Eina_Bool cur_prev);
1671 1671
1672Eina_Bool _efl_canvas_object_clip_set_block(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_clip, Evas_Object_Protected_Data *clip); 1672Eina_Bool _efl_canvas_object_clipper_set_block(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_clip, Evas_Object_Protected_Data *clip);
1673Eina_Bool _efl_canvas_object_clip_unset_block(Eo *eo_obj, Evas_Object_Protected_Data *obj); 1673Eina_Bool _efl_canvas_object_clipper_unset_block(Eo *eo_obj, Evas_Object_Protected_Data *obj);
1674Eina_Bool _efl_canvas_object_efl_gfx_entity_size_set_block(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h, Eina_Bool internal); 1674Eina_Bool _efl_canvas_object_efl_gfx_entity_size_set_block(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h, Eina_Bool internal);
1675 1675
1676void _evas_focus_device_invalidate_cb(void *data, const Efl_Event *ev); 1676void _evas_focus_device_invalidate_cb(void *data, const Efl_Event *ev);
diff --git a/src/tests/edje/edje_test_features.c b/src/tests/edje/edje_test_features.c
index 1cff283835..449e97e587 100644
--- a/src/tests/edje/edje_test_features.c
+++ b/src/tests/edje/edje_test_features.c
@@ -42,13 +42,13 @@ EFL_START_TEST(edje_test_masking)
42 edje_object_freeze(obj); 42 edje_object_freeze(obj);
43 sub = edje_object_part_object_get(obj, "text"); 43 sub = edje_object_part_object_get(obj, "text");
44 edje_object_thaw(obj); 44 edje_object_thaw(obj);
45 fail_if(!efl_canvas_object_clip_get(sub)); 45 fail_if(!efl_canvas_object_clipper_get(sub));
46 46
47 /* test description.clip_to override */ 47 /* test description.clip_to override */
48 edje_object_freeze(obj); 48 edje_object_freeze(obj);
49 sub = edje_object_part_object_get(obj, "noclip"); 49 sub = edje_object_part_object_get(obj, "noclip");
50 edje_object_thaw(obj); 50 edje_object_thaw(obj);
51 clip2 = efl_canvas_object_clip_get(sub); 51 clip2 = efl_canvas_object_clipper_get(sub);
52 fail_if(clip != clip2); 52 fail_if(clip != clip2);
53 53
54 evas_free(evas); 54 evas_free(evas);
diff --git a/src/tests/evas/evas_test_mask.c b/src/tests/evas/evas_test_mask.c
index bdb3b627dd..917c4c3496 100644
--- a/src/tests/evas/evas_test_mask.c
+++ b/src/tests/evas/evas_test_mask.c
@@ -80,7 +80,7 @@ EFL_START_TEST(evas_mask_test_setget)
80 } 80 }
81 fail_if(i != 1); 81 fail_if(i != 1);
82 82
83 it = efl_canvas_object_clipees_get(mask); 83 it = efl_canvas_object_clipped_objects_get(mask);
84 i = 0; 84 i = 0;
85 EINA_ITERATOR_FOREACH(it, o) 85 EINA_ITERATOR_FOREACH(it, o)
86 { 86 {