summaryrefslogtreecommitdiff
path: root/src/lib/elementary/efl_page_transition_scroll.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/elementary/efl_page_transition_scroll.c')
-rw-r--r--src/lib/elementary/efl_page_transition_scroll.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/lib/elementary/efl_page_transition_scroll.c b/src/lib/elementary/efl_page_transition_scroll.c
index 34209ae..4979206 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;