summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaeun Choi <jaeun12.choi@samsung.com>2017-10-20 19:25:40 +0900
committerJaeun Choi <jaeun12.choi@samsung.com>2017-10-25 14:12:47 +0900
commit3c90ca3e84a747cf1dfe687c09d521b9a326ce44 (patch)
tree5298ed0d205665590fde5a2608d0a84f89c40116
parentf773d0b093acc20bf07f2cb3905d3df9e92042d9 (diff)
Rebase on master branch
-rwxr-xr-xsrc/examples/elementary/efl_ui_pager_example.c4
-rw-r--r--src/lib/elementary/efl_page_transition_scroll.c8
-rw-r--r--src/lib/elementary/efl_ui_pagecontrol.c36
-rw-r--r--src/lib/elementary/efl_ui_pageindicator.c7
-rw-r--r--src/lib/elementary/efl_ui_pager.c60
-rw-r--r--src/lib/elementary/efl_ui_pager.eo4
-rw-r--r--src/lib/elementary/efl_ui_pagescroller.c62
-rw-r--r--src/lib/elementary/efl_ui_pagescroller.eo4
-rw-r--r--src/lib/elementary/efl_ui_widget_pagecontrol.h3
-rw-r--r--src/lib/elementary/efl_ui_widget_pager.h2
-rw-r--r--src/lib/elementary/efl_ui_widget_pagescroller.h2
11 files changed, 90 insertions, 102 deletions
diff --git a/src/examples/elementary/efl_ui_pager_example.c b/src/examples/elementary/efl_ui_pager_example.c
index 16f6a37274..811f29d621 100755
--- a/src/examples/elementary/efl_ui_pager_example.c
+++ b/src/examples/elementary/efl_ui_pager_example.c
@@ -29,11 +29,11 @@ elm_main(int argc,
29 29
30 // Window 30 // Window
31 win = efl_add(efl_ui_win_class_get(), NULL, "test", ELM_WIN_BASIC); 31 win = efl_add(efl_ui_win_class_get(), NULL, "test", ELM_WIN_BASIC);
32 efl_gfx_size_set(win, WIN_WIDTH, WIN_HEIGHT); 32 efl_gfx_size_set(win, EINA_SIZE2D(WIN_WIDTH, WIN_HEIGHT));
33 efl_gfx_visible_set(win, EINA_TRUE); 33 efl_gfx_visible_set(win, EINA_TRUE);
34 34
35 // Layout 35 // Layout
36 layout = efl_add(ELM_LAYOUT_CLASS, win); 36 layout = efl_add(EFL_UI_LAYOUT_CLASS, win);
37 efl_gfx_size_hint_weight_set(layout, 1, 1); 37 efl_gfx_size_hint_weight_set(layout, 1, 1);
38 efl_file_set(layout, "pagecontrol.edj", "pagecontrol_example"); 38 efl_file_set(layout, "pagecontrol.edj", "pagecontrol_example");
39 efl_content_set(win, layout); 39 efl_content_set(win, layout);
diff --git a/src/lib/elementary/efl_page_transition_scroll.c b/src/lib/elementary/efl_page_transition_scroll.c
index 44ab19ebe8..f5f9dd0f62 100644
--- a/src/lib/elementary/efl_page_transition_scroll.c
+++ b/src/lib/elementary/efl_page_transition_scroll.c
@@ -76,8 +76,8 @@ _efl_page_transition_scroll_efl_page_transition_update(Eo *obj EINA_UNUSED,
76 { 76 {
77 if (pd->move == 0.0) 77 if (pd->move == 0.0)
78 { 78 {
79 efl_gfx_position_set(pi->obj, pi->x, pi->y); 79 efl_gfx_position_set(pi->obj, EINA_POSITION2D(pi->x, pi->y));
80 efl_gfx_size_set(pi->obj, pi->w, pi->h); 80 efl_gfx_size_set(pi->obj, EINA_SIZE2D(pi->w, pi->h));
81 } 81 }
82 else 82 else
83 { 83 {
@@ -93,8 +93,8 @@ _efl_page_transition_scroll_efl_page_transition_update(Eo *obj EINA_UNUSED,
93 pi->tw = tpi->w * t + pi->w * (1 - t); 93 pi->tw = tpi->w * t + pi->w * (1 - t);
94 pi->th = tpi->h * t + pi->h * (1 - t); 94 pi->th = tpi->h * t + pi->h * (1 - t);
95 95
96 efl_gfx_position_set(pi->obj, pi->tx, pi->ty); 96 efl_gfx_position_set(pi->obj, EINA_POSITION2D(pi->tx, pi->ty));
97 efl_gfx_size_set(pi->obj, pi->tw, pi->th); 97 efl_gfx_size_set(pi->obj, EINA_SIZE2D(pi->tw, pi->th));
98 98
99 if (((pd->move < 0) && (tpi->id > pi->id)) 99 if (((pd->move < 0) && (tpi->id > pi->id))
100 || ((pd->move > 0) && (tpi->id < pi->id))) 100 || ((pd->move > 0) && (tpi->id < pi->id)))
diff --git a/src/lib/elementary/efl_ui_pagecontrol.c b/src/lib/elementary/efl_ui_pagecontrol.c
index 7a3149a155..551fa44561 100644
--- a/src/lib/elementary/efl_ui_pagecontrol.c
+++ b/src/lib/elementary/efl_ui_pagecontrol.c
@@ -35,25 +35,24 @@ _efl_ui_pagecontrol_efl_canvas_group_group_add(Eo *obj,
35 sd->cnt = 0; 35 sd->cnt = 0;
36 sd->page = 0; 36 sd->page = 0;
37 sd->ratio = 0.0; 37 sd->ratio = 0.0;
38 sd->orientation = EFL_ORIENT_HORIZONTAL; 38 sd->dir = EFL_UI_DIR_HORIZONTAL;
39} 39}
40 40
41EOLIAN static void 41EOLIAN static void
42_efl_ui_pagecontrol_efl_gfx_size_set(Eo *obj, 42_efl_ui_pagecontrol_efl_gfx_size_set(Eo *obj,
43 Efl_Ui_Pagecontrol_Data *sd, 43 Efl_Ui_Pagecontrol_Data *sd,
44 Evas_Coord w, 44 Eina_Size2D sz)
45 Evas_Coord h)
46{ 45{
47 if ((sd->w == w) && (sd->h == h)) return; 46 if ((sd->w == sz.w) && (sd->h == sz.h)) return;
48 47
49 efl_gfx_size_set(efl_super(obj, MY_CLASS), w, h); 48 efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
50 49
51 sd->w = w; 50 sd->w = sz.w;
52 sd->h = h; 51 sd->h = sz.h;
53 52
54 efl_gfx_size_set(sd->event, w, h); 53 efl_gfx_size_set(sd->event, sz);
55 efl_gfx_size_set(sd->viewport.foreclip, w, h); 54 efl_gfx_size_set(sd->viewport.foreclip, sz);
56 efl_gfx_size_set(sd->viewport.backclip, w, h); 55 efl_gfx_size_set(sd->viewport.backclip, sz);
57 56
58 efl_ui_pagecontrol_update(obj); 57 efl_ui_pagecontrol_update(obj);
59} 58}
@@ -61,19 +60,18 @@ _efl_ui_pagecontrol_efl_gfx_size_set(Eo *obj,
61EOLIAN static void 60EOLIAN static void
62_efl_ui_pagecontrol_efl_gfx_position_set(Eo *obj, 61_efl_ui_pagecontrol_efl_gfx_position_set(Eo *obj,
63 Efl_Ui_Pagecontrol_Data *sd, 62 Efl_Ui_Pagecontrol_Data *sd,
64 Evas_Coord x, 63 Eina_Position2D pos)
65 Evas_Coord y)
66{ 64{
67 if ((sd->x == x) && (sd->y == y)) return; 65 if ((sd->x == pos.x) && (sd->y == pos.y)) return;
68 66
69 efl_gfx_position_set(efl_super(obj, MY_CLASS), x, y); 67 efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
70 68
71 sd->x = x; 69 sd->x = pos.x;
72 sd->y = y; 70 sd->y = pos.y;
73 71
74 efl_gfx_position_set(sd->event, x, y); 72 efl_gfx_position_set(sd->event, pos);
75 efl_gfx_position_set(sd->viewport.foreclip, x, y); 73 efl_gfx_position_set(sd->viewport.foreclip, pos);
76 efl_gfx_position_set(sd->viewport.backclip, x, y); 74 efl_gfx_position_set(sd->viewport.backclip, pos);
77} 75}
78 76
79EOLIAN static int 77EOLIAN static int
diff --git a/src/lib/elementary/efl_ui_pageindicator.c b/src/lib/elementary/efl_ui_pageindicator.c
index 2856696bcd..73ab08ff23 100644
--- a/src/lib/elementary/efl_ui_pageindicator.c
+++ b/src/lib/elementary/efl_ui_pageindicator.c
@@ -15,12 +15,11 @@
15EOLIAN static void 15EOLIAN static void
16_efl_ui_pageindicator_efl_gfx_size_set(Eo *obj, 16_efl_ui_pageindicator_efl_gfx_size_set(Eo *obj,
17 Efl_Ui_Pageindicator_Data *sd, 17 Efl_Ui_Pageindicator_Data *sd,
18 Evas_Coord w, 18 Eina_Size2D sz)
19 Evas_Coord h)
20{ 19{
21 efl_gfx_size_set(sd->box, w, h); 20 efl_gfx_size_set(sd->box, sz);
22 21
23 efl_gfx_size_set(efl_super(obj, MY_CLASS), w, h); 22 efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
24} 23}
25 24
26static void 25static void
diff --git a/src/lib/elementary/efl_ui_pager.c b/src/lib/elementary/efl_ui_pager.c
index eed2ef341c..35bad0ffc6 100644
--- a/src/lib/elementary/efl_ui_pager.c
+++ b/src/lib/elementary/efl_ui_pager.c
@@ -43,7 +43,7 @@ _job(void *data)
43 43
44 sd->job = NULL; 44 sd->job = NULL;
45 45
46 if (sd->orientation == EFL_ORIENT_HORIZONTAL) 46 if (sd->dir == EFL_UI_DIR_HORIZONTAL)
47 t = ((double)sd->mouse_down.x - (double)sd->mouse_x) / (double)sd->w; 47 t = ((double)sd->mouse_down.x - (double)sd->mouse_x) / (double)sd->w;
48 else 48 else
49 t = ((double)sd->mouse_down.y - (double)sd->mouse_y) / (double)sd->h; 49 t = ((double)sd->mouse_down.y - (double)sd->mouse_y) / (double)sd->h;
@@ -275,8 +275,6 @@ _event_handler_create(Eo *obj, Efl_Ui_Pager_Data *sd)
275 sd->event = evas_object_rectangle_add(evas_object_evas_get(obj)); 275 sd->event = evas_object_rectangle_add(evas_object_evas_get(obj));
276 276
277 evas_object_color_set(sd->event, 0, 0, 0, 0); 277 evas_object_color_set(sd->event, 0, 0, 0, 0);
278 efl_gfx_position_set(sd->event, sd->x, sd->y);
279 efl_gfx_size_set(sd->event, sd->w, sd->h);
280 efl_gfx_visible_set(sd->event, EINA_TRUE); 278 efl_gfx_visible_set(sd->event, EINA_TRUE);
281 279
282 evas_object_event_callback_add(sd->event, EVAS_CALLBACK_MOUSE_DOWN, 280 evas_object_event_callback_add(sd->event, EVAS_CALLBACK_MOUSE_DOWN,
@@ -298,7 +296,7 @@ _efl_ui_pager_efl_canvas_group_group_add(Eo *obj,
298 pd->cnt = 0; 296 pd->cnt = 0;
299 pd->page_info_num = 5; //TEMP 297 pd->page_info_num = 5; //TEMP
300 pd->move = 0.0; 298 pd->move = 0.0;
301 pd->orientation = EFL_ORIENT_HORIZONTAL; 299 pd->dir = EFL_UI_DIR_HORIZONTAL;
302 300
303 pd->viewport.foreclip = evas_object_rectangle_add(evas_object_evas_get(obj)); 301 pd->viewport.foreclip = evas_object_rectangle_add(evas_object_evas_get(obj));
304 evas_object_static_clip_set(pd->viewport.foreclip, EINA_TRUE); 302 evas_object_static_clip_set(pd->viewport.foreclip, EINA_TRUE);
@@ -330,19 +328,18 @@ _page_info_job(void *data)
330EOLIAN static void 328EOLIAN static void
331_efl_ui_pager_efl_gfx_size_set(Eo *obj, 329_efl_ui_pager_efl_gfx_size_set(Eo *obj,
332 Efl_Ui_Pager_Data *sd, 330 Efl_Ui_Pager_Data *sd,
333 Evas_Coord w, 331 Eina_Size2D sz)
334 Evas_Coord h)
335{ 332{
336 if ((sd->w == w) && (sd->h == h)) return; 333 if ((sd->w == sz.w) && (sd->h == sz.h)) return;
337 334
338 efl_gfx_size_set(efl_super(obj, MY_CLASS), w, h); 335 efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
339 336
340 sd->w = w; 337 sd->w = sz.w;
341 sd->h = h; 338 sd->h = sz.h;
342 339
343 efl_gfx_size_set(sd->event, w, h); 340 efl_gfx_size_set(sd->event, sz);
344 efl_gfx_size_set(sd->viewport.foreclip, w, h); 341 efl_gfx_size_set(sd->viewport.foreclip, sz);
345 efl_gfx_size_set(sd->viewport.backclip, w, h); 342 efl_gfx_size_set(sd->viewport.backclip, sz);
346 343
347 if (sd->page_info_job) ecore_job_del(sd->page_info_job); 344 if (sd->page_info_job) ecore_job_del(sd->page_info_job);
348 sd->page_info_job = ecore_job_add(_page_info_job, sd); 345 sd->page_info_job = ecore_job_add(_page_info_job, sd);
@@ -351,19 +348,18 @@ _efl_ui_pager_efl_gfx_size_set(Eo *obj,
351EOLIAN static void 348EOLIAN static void
352_efl_ui_pager_efl_gfx_position_set(Eo *obj, 349_efl_ui_pager_efl_gfx_position_set(Eo *obj,
353 Efl_Ui_Pager_Data *sd, 350 Efl_Ui_Pager_Data *sd,
354 Evas_Coord x, 351 Eina_Position2D pos)
355 Evas_Coord y)
356{ 352{
357 if ((sd->x == x) && (sd->y == y)) return; 353 if ((sd->x == pos.x) && (sd->y == pos.y)) return;
358 354
359 efl_gfx_position_set(efl_super(obj, MY_CLASS), x, y); 355 efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
360 356
361 sd->x = x; 357 sd->x = pos.x;
362 sd->y = y; 358 sd->y = pos.y;
363 359
364 efl_gfx_position_set(sd->event, x, y); 360 efl_gfx_position_set(sd->event, pos);
365 efl_gfx_position_set(sd->viewport.foreclip, x, y); 361 efl_gfx_position_set(sd->viewport.foreclip, pos);
366 efl_gfx_position_set(sd->viewport.backclip, x, y); 362 efl_gfx_position_set(sd->viewport.backclip, pos);
367 363
368 if (sd->page_info_job) ecore_job_del(sd->page_info_job); 364 if (sd->page_info_job) ecore_job_del(sd->page_info_job);
369 sd->page_info_job = ecore_job_add(_page_info_job, sd); 365 sd->page_info_job = ecore_job_add(_page_info_job, sd);
@@ -494,23 +490,23 @@ _efl_ui_pager_transition_set(Eo *obj EINA_UNUSED,
494 sd->transition = transition; 490 sd->transition = transition;
495} 491}
496 492
497EOLIAN static Efl_Orient 493EOLIAN static Efl_Ui_Dir
498_efl_ui_pager_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, 494_efl_ui_pager_efl_ui_direction_direction_get(Eo *obj EINA_UNUSED,
499 Efl_Ui_Pager_Data *sd) 495 Efl_Ui_Pager_Data *sd)
500{ 496{
501 return sd->orientation; 497 return sd->dir;
502} 498}
503 499
504EOLIAN static void 500EOLIAN static void
505_efl_ui_pager_efl_orientation_orientation_set(Eo *obj EINA_UNUSED, 501_efl_ui_pager_efl_ui_direction_direction_set(Eo *obj EINA_UNUSED,
506 Efl_Ui_Pager_Data *sd, 502 Efl_Ui_Pager_Data *sd,
507 Efl_Orient dir) 503 Efl_Ui_Dir dir)
508{ 504{
509 if (dir != EFL_ORIENT_VERTICAL && 505 if (dir != EFL_UI_DIR_VERTICAL &&
510 dir != EFL_ORIENT_HORIZONTAL) 506 dir != EFL_UI_DIR_HORIZONTAL)
511 return; 507 return;
512 508
513 sd->orientation = dir; 509 sd->dir = dir;
514} 510}
515 511
516EOLIAN static void 512EOLIAN static void
diff --git a/src/lib/elementary/efl_ui_pager.eo b/src/lib/elementary/efl_ui_pager.eo
index a9cc1d95a0..c230a10f34 100644
--- a/src/lib/elementary/efl_ui_pager.eo
+++ b/src/lib/elementary/efl_ui_pager.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Pager (Elm.Widget, Efl.Pack.Linear, Efl.Orientation) 1class Efl.Ui.Pager (Elm.Widget, Efl.Pack.Linear, Efl.Ui.Direction)
2{ 2{
3 [[Efl ui pager class]] 3 [[Efl ui pager class]]
4 event_prefix: efl_ui_pager; 4 event_prefix: efl_ui_pager;
@@ -47,7 +47,7 @@ class Efl.Ui.Pager (Elm.Widget, Efl.Pack.Linear, Efl.Orientation)
47 Efl.Pack.Linear.pack_end; 47 Efl.Pack.Linear.pack_end;
48 Efl.Pack.Linear.pack_content_get; 48 Efl.Pack.Linear.pack_content_get;
49 Efl.Pack.Linear.pack_index_get; 49 Efl.Pack.Linear.pack_index_get;
50 Efl.Orientation.orientation { set; get; } 50 Efl.Ui.Direction.direction { set; get; }
51 } 51 }
52 events { 52 events {
53 updated; [[Called when pager is scrolled]] 53 updated; [[Called when pager is scrolled]]
diff --git a/src/lib/elementary/efl_ui_pagescroller.c b/src/lib/elementary/efl_ui_pagescroller.c
index e2f0f40897..29a2f3e1f1 100644
--- a/src/lib/elementary/efl_ui_pagescroller.c
+++ b/src/lib/elementary/efl_ui_pagescroller.c
@@ -30,7 +30,7 @@ _efl_ui_pagescroller_update(Eo *obj,
30 // geometry isn't enough - think about cube effect 30 // geometry isn't enough - think about cube effect
31 EINA_LIST_FOREACH(pd->content_list, l, subobj) 31 EINA_LIST_FOREACH(pd->content_list, l, subobj)
32 { 32 {
33 efl_gfx_size_set(subobj, pd->w, pd->h); 33 efl_gfx_size_set(subobj, EINA_SIZE2D(pd->w, pd->h));
34 evas_object_clip_set(subobj, pd->hidden_clip); 34 evas_object_clip_set(subobj, pd->hidden_clip);
35 } 35 }
36 36
@@ -76,7 +76,7 @@ _job(void *data)
76 sd->job = NULL; 76 sd->job = NULL;
77 77
78 // calculate t based on mouse position 78 // calculate t based on mouse position
79 if (sd->orientation == EFL_ORIENT_HORIZONTAL) 79 if (sd->dir == EFL_UI_DIR_HORIZONTAL)
80 t = ((double)sd->mouse_down.x - (double)sd->mouse_x) / (double)sd->w; 80 t = ((double)sd->mouse_down.x - (double)sd->mouse_x) / (double)sd->w;
81 else 81 else
82 t = ((double)sd->mouse_down.y - (double)sd->mouse_y) / (double)sd->h; 82 t = ((double)sd->mouse_down.y - (double)sd->mouse_y) / (double)sd->h;
@@ -233,8 +233,6 @@ _event_handler_create(Eo *obj, Efl_Ui_Pagescroller_Data *sd)
233 sd->event = evas_object_rectangle_add(evas_object_evas_get(obj)); 233 sd->event = evas_object_rectangle_add(evas_object_evas_get(obj));
234 234
235 evas_object_color_set(sd->event, 0, 0, 0, 0); 235 evas_object_color_set(sd->event, 0, 0, 0, 0);
236 efl_gfx_position_set(sd->event, sd->x, sd->y);
237 efl_gfx_size_set(sd->event, sd->w, sd->h);
238 efl_gfx_visible_set(sd->event, EINA_TRUE); 236 efl_gfx_visible_set(sd->event, EINA_TRUE);
239 237
240 evas_object_event_callback_add(sd->event, EVAS_CALLBACK_MOUSE_DOWN, 238 evas_object_event_callback_add(sd->event, EVAS_CALLBACK_MOUSE_DOWN,
@@ -264,7 +262,7 @@ _efl_ui_pagescroller_efl_canvas_group_group_add(Eo *obj,
264 pd->cnt = 0; 262 pd->cnt = 0;
265 pd->page = 0; 263 pd->page = 0;
266 pd->ratio = 0.0; 264 pd->ratio = 0.0;
267 pd->orientation = EFL_ORIENT_HORIZONTAL; 265 pd->dir = EFL_UI_DIR_HORIZONTAL;
268 266
269 pd->viewport.foreclip = evas_object_rectangle_add(evas_object_evas_get(obj)); 267 pd->viewport.foreclip = evas_object_rectangle_add(evas_object_evas_get(obj));
270 evas_object_static_clip_set(pd->viewport.foreclip, EINA_TRUE); 268 evas_object_static_clip_set(pd->viewport.foreclip, EINA_TRUE);
@@ -281,19 +279,18 @@ _efl_ui_pagescroller_efl_canvas_group_group_add(Eo *obj,
281EOLIAN static void 279EOLIAN static void
282_efl_ui_pagescroller_efl_gfx_size_set(Eo *obj, 280_efl_ui_pagescroller_efl_gfx_size_set(Eo *obj,
283 Efl_Ui_Pagescroller_Data *sd, 281 Efl_Ui_Pagescroller_Data *sd,
284 Evas_Coord w, 282 Eina_Size2D sz)
285 Evas_Coord h)
286{ 283{
287 if ((sd->w == w) && (sd->h == h)) return; 284 if ((sd->w == sz.w) && (sd->h == sz.h)) return;
288 285
289 efl_gfx_size_set(efl_super(obj, MY_CLASS), w, h); 286 efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
290 287
291 sd->w = w; 288 sd->w = sz.w;
292 sd->h = h; 289 sd->h = sz.h;
293 290
294 efl_gfx_size_set(sd->event, w, h); 291 efl_gfx_size_set(sd->event, sz);
295 efl_gfx_size_set(sd->viewport.foreclip, w, h); 292 efl_gfx_size_set(sd->viewport.foreclip, sz);
296 efl_gfx_size_set(sd->viewport.backclip, w, h); 293 efl_gfx_size_set(sd->viewport.backclip, sz);
297 294
298 efl_ui_pagescroller_update(obj); 295 efl_ui_pagescroller_update(obj);
299} 296}
@@ -301,19 +298,18 @@ _efl_ui_pagescroller_efl_gfx_size_set(Eo *obj,
301EOLIAN static void 298EOLIAN static void
302_efl_ui_pagescroller_efl_gfx_position_set(Eo *obj, 299_efl_ui_pagescroller_efl_gfx_position_set(Eo *obj,
303 Efl_Ui_Pagescroller_Data *sd, 300 Efl_Ui_Pagescroller_Data *sd,
304 Evas_Coord x, 301 Eina_Position2D pos)
305 Evas_Coord y)
306{ 302{
307 if ((sd->x == x) && (sd->y == y)) return; 303 if ((sd->x == pos.x) && (sd->y == pos.y)) return;
308 304
309 efl_gfx_position_set(efl_super(obj, MY_CLASS), x, y); 305 efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
310 306
311 sd->x = x; 307 sd->x = pos.x;
312 sd->y = y; 308 sd->y = pos.y;
313 309
314 efl_gfx_position_set(sd->event, x, y); 310 efl_gfx_position_set(sd->event, pos);
315 efl_gfx_position_set(sd->viewport.foreclip, x, y); 311 efl_gfx_position_set(sd->viewport.foreclip, pos);
316 efl_gfx_position_set(sd->viewport.backclip, x, y); 312 efl_gfx_position_set(sd->viewport.backclip, pos);
317} 313}
318 314
319EOLIAN static int 315EOLIAN static int
@@ -431,23 +427,23 @@ _efl_ui_pagescroller_transition_set(Eo *obj EINA_UNUSED,
431 sd->transition = transition; 427 sd->transition = transition;
432} 428}
433 429
434EOLIAN static Efl_Orient 430EOLIAN static Efl_Ui_Dir
435_efl_ui_pagescroller_efl_orientation_orientation_get(Eo *obj, 431_efl_ui_pagescroller_efl_ui_direction_direction_get(Eo *obj,
436 Efl_Ui_Pagescroller_Data *sd) 432 Efl_Ui_Pagescroller_Data *sd)
437{ 433{
438 return sd->orientation; 434 return sd->dir;
439} 435}
440 436
441EOLIAN static void 437EOLIAN static void
442_efl_ui_pagescroller_efl_orientation_orientation_set(Eo *obj, 438_efl_ui_pagescroller_efl_ui_direction_direction_set(Eo *obj,
443 Efl_Ui_Pagescroller_Data *sd, 439 Efl_Ui_Pagescroller_Data *sd,
444 Efl_Orient dir) 440 Efl_Ui_Dir dir)
445{ 441{
446 if (dir != EFL_ORIENT_VERTICAL && 442 if (dir != EFL_UI_DIR_VERTICAL &&
447 dir != EFL_ORIENT_HORIZONTAL) 443 dir != EFL_UI_DIR_HORIZONTAL)
448 return; 444 return;
449 445
450 sd->orientation = dir; 446 sd->dir = dir;
451} 447}
452 448
453EOLIAN static void 449EOLIAN static void
diff --git a/src/lib/elementary/efl_ui_pagescroller.eo b/src/lib/elementary/efl_ui_pagescroller.eo
index 212844e3f5..36354b0e8f 100644
--- a/src/lib/elementary/efl_ui_pagescroller.eo
+++ b/src/lib/elementary/efl_ui_pagescroller.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Pagescroller (Elm.Widget, Efl.Pack.Linear, Efl.Orientation) 1class Efl.Ui.Pagescroller (Elm.Widget, Efl.Pack.Linear, Efl.Ui.Direction)
2{ 2{
3 [[Efl ui pagescroller class]] 3 [[Efl ui pagescroller class]]
4 event_prefix: efl_ui_pagescroller; 4 event_prefix: efl_ui_pagescroller;
@@ -43,7 +43,7 @@ class Efl.Ui.Pagescroller (Elm.Widget, Efl.Pack.Linear, Efl.Orientation)
43 Efl.Pack.Linear.pack_end; 43 Efl.Pack.Linear.pack_end;
44 Efl.Pack.Linear.pack_content_get; 44 Efl.Pack.Linear.pack_content_get;
45 Efl.Pack.Linear.pack_index_get; 45 Efl.Pack.Linear.pack_index_get;
46 Efl.Orientation.orientation { set; get; } 46 Efl.Ui.Direction.direction { set; get; }
47 } 47 }
48 events { 48 events {
49 updated; [[Called when pagescroller is scrolled]] 49 updated; [[Called when pagescroller is scrolled]]
diff --git a/src/lib/elementary/efl_ui_widget_pagecontrol.h b/src/lib/elementary/efl_ui_widget_pagecontrol.h
index 83b54fedc7..e29a7ce646 100644
--- a/src/lib/elementary/efl_ui_widget_pagecontrol.h
+++ b/src/lib/elementary/efl_ui_widget_pagecontrol.h
@@ -45,11 +45,10 @@ typedef struct _Efl_Ui_Pagecontrol_Data
45 45
46 int num_of_pages; 46 int num_of_pages;
47 int cnt; 47 int cnt;
48 int dir;
49 int page; 48 int page;
50 double ratio; 49 double ratio;
51 50
52 Efl_Orient orientation; 51 Efl_Ui_Dir dir;
53 Eina_Bool move_started : 1; 52 Eina_Bool move_started : 1;
54 Eina_Bool map_enabled : 1; 53 Eina_Bool map_enabled : 1;
55 54
diff --git a/src/lib/elementary/efl_ui_widget_pager.h b/src/lib/elementary/efl_ui_widget_pager.h
index 4a13bf93cc..9c1dea8bb6 100644
--- a/src/lib/elementary/efl_ui_widget_pager.h
+++ b/src/lib/elementary/efl_ui_widget_pager.h
@@ -65,7 +65,7 @@ typedef struct _Efl_Ui_Pager_Data
65 Eina_Bool jump; 65 Eina_Bool jump;
66 } change; 66 } change;
67 67
68 Efl_Orient orientation; 68 Efl_Ui_Dir dir;
69 Efl_Page_Transition *transition; 69 Efl_Page_Transition *transition;
70 70
71 Eina_Bool move_started : 1; 71 Eina_Bool move_started : 1;
diff --git a/src/lib/elementary/efl_ui_widget_pagescroller.h b/src/lib/elementary/efl_ui_widget_pagescroller.h
index b9ed1f3926..7467eb7926 100644
--- a/src/lib/elementary/efl_ui_widget_pagescroller.h
+++ b/src/lib/elementary/efl_ui_widget_pagescroller.h
@@ -42,7 +42,7 @@ typedef struct _Efl_Ui_Pagescroller_Data
42 Eina_Bool jump; 42 Eina_Bool jump;
43 } change; 43 } change;
44 44
45 Efl_Orient orientation; 45 Efl_Ui_Dir dir;
46 Efl_Page_Transition *transition; 46 Efl_Page_Transition *transition;
47 47
48 Eina_Bool move_started : 1; 48 Eina_Bool move_started : 1;