summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-08-10 00:01:32 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-08-10 14:42:08 +0900
commit5edb69f4aec8b7ccd55815de97f87bf511be4ac4 (patch)
tree174cf3aa186a3890edcc0232c1313b1c416b9a6c
parentc87f6018f904da137b06d29566e43268ed6193ad (diff)
slider: Switch to Efl.Ui.Dir (EO)
Ref T5870
-rw-r--r--src/lib/elementary/efl_ui_slider.c121
-rw-r--r--src/lib/elementary/efl_ui_slider.eo5
-rw-r--r--src/lib/elementary/efl_ui_slider_private.h2
3 files changed, 61 insertions, 67 deletions
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index 9b32a1b7ca..95ddded733 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -77,41 +77,36 @@ _delay_change(void *data)
77} 77}
78 78
79static inline Eina_Bool 79static inline Eina_Bool
80_is_horizontal(Efl_Orient orientation) 80_is_horizontal(Efl_Ui_Dir dir)
81{ 81{
82 if (orientation == EFL_ORIENT_LEFT || 82 return efl_ui_dir_is_horizontal(dir, EINA_TRUE);
83 orientation == EFL_ORIENT_RIGHT)
84 return EINA_TRUE;
85
86 return EINA_FALSE;
87} 83}
88 84
89static inline Eina_Bool 85static inline Eina_Bool
90_is_inverted(Efl_Orient orientation) 86_is_inverted(Efl_Ui_Dir dir)
91{ 87{
92 if (orientation == EFL_ORIENT_LEFT || 88 if ((dir == EFL_UI_DIR_LEFT) || (dir == EFL_UI_DIR_UP))
93 orientation == EFL_ORIENT_UP)
94 return EINA_TRUE; 89 return EINA_TRUE;
95 90
96 return EINA_FALSE; 91 return EINA_FALSE;
97} 92}
98 93
99static Efl_Orient 94static Efl_Ui_Dir
100_orientation_get(Eina_Bool horizontal, Eina_Bool inverted) 95_direction_get(Eina_Bool horizontal, Eina_Bool inverted)
101{ 96{
102 if (horizontal) 97 if (horizontal)
103 { 98 {
104 if (inverted) 99 if (inverted)
105 return EFL_ORIENT_LEFT; 100 return EFL_UI_DIR_LEFT;
106 else 101 else
107 return EFL_ORIENT_RIGHT; 102 return EFL_UI_DIR_RIGHT;
108 } 103 }
109 else 104 else
110 { 105 {
111 if (inverted) 106 if (inverted)
112 return EFL_ORIENT_UP; 107 return EFL_UI_DIR_UP;
113 else 108 else
114 return EFL_ORIENT_DOWN; 109 return EFL_UI_DIR_DOWN;
115 } 110 }
116} 111}
117 112
@@ -127,18 +122,18 @@ _val_fetch(Evas_Object *obj, Eina_Bool user_event)
127 122
128 edje_object_part_drag_value_get 123 edje_object_part_drag_value_get
129 (wd->resize_obj, "elm.dragable.slider", &posx, &posy); 124 (wd->resize_obj, "elm.dragable.slider", &posx, &posy);
130 if (_is_horizontal(sd->orientation)) pos = posx; 125 if (_is_horizontal(sd->dir)) pos = posx;
131 else pos = posy; 126 else pos = posy;
132 127
133 edje_object_part_drag_value_get 128 edje_object_part_drag_value_get
134 (wd->resize_obj, "elm.dragable2.slider", &posx2, &posy2); 129 (wd->resize_obj, "elm.dragable2.slider", &posx2, &posy2);
135 if (_is_horizontal(sd->orientation)) pos2 = posx2; 130 if (_is_horizontal(sd->dir)) pos2 = posx2;
136 else pos2 = posy2; 131 else pos2 = posy2;
137 132
138 rtl = efl_ui_mirrored_get(obj); 133 rtl = efl_ui_mirrored_get(obj);
139 if ((!rtl && _is_inverted(sd->orientation)) || 134 if ((!rtl && _is_inverted(sd->dir)) ||
140 (rtl && ((sd->orientation == EFL_ORIENT_UP) || 135 (rtl && ((sd->dir == EFL_UI_DIR_UP) ||
141 (sd->orientation == EFL_ORIENT_RIGHT)))) 136 (sd->dir == EFL_UI_DIR_RIGHT))))
142 { 137 {
143 pos = 1.0 - pos; 138 pos = 1.0 - pos;
144 pos2 = 1.0 - pos2; 139 pos2 = 1.0 - pos2;
@@ -197,9 +192,9 @@ _val_set(Evas_Object *obj)
197 pos2 = 1.0; 192 pos2 = 1.0;
198 193
199 rtl = efl_ui_mirrored_get(obj); 194 rtl = efl_ui_mirrored_get(obj);
200 if ((!rtl && _is_inverted(sd->orientation)) || 195 if ((!rtl && _is_inverted(sd->dir)) ||
201 (rtl && ((sd->orientation == EFL_ORIENT_UP) || 196 (rtl && ((sd->dir == EFL_UI_DIR_UP) ||
202 (sd->orientation == EFL_ORIENT_RIGHT)))) 197 (sd->dir == EFL_UI_DIR_RIGHT))))
203 { 198 {
204 pos = 1.0 - pos; 199 pos = 1.0 - pos;
205 pos2 = 1.0 - pos2; 200 pos2 = 1.0 - pos2;
@@ -395,7 +390,7 @@ _drag_up(void *data,
395 EFL_UI_SLIDER_DATA_GET(data, sd); 390 EFL_UI_SLIDER_DATA_GET(data, sd);
396 step = sd->step; 391 step = sd->step;
397 392
398 if (_is_inverted(sd->orientation)) step *= -1.0; 393 if (_is_inverted(sd->dir)) step *= -1.0;
399 394
400 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd); 395 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
401 edje_object_part_drag_step 396 edje_object_part_drag_step
@@ -413,7 +408,7 @@ _drag_down(void *data,
413 EFL_UI_SLIDER_DATA_GET(data, sd); 408 EFL_UI_SLIDER_DATA_GET(data, sd);
414 step = -sd->step; 409 step = -sd->step;
415 410
416 if (_is_inverted(sd->orientation)) step *= -1.0; 411 if (_is_inverted(sd->dir)) step *= -1.0;
417 412
418 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd); 413 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
419 edje_object_part_drag_step 414 edje_object_part_drag_step
@@ -523,33 +518,33 @@ _key_action_drag(Evas_Object *obj, const char *params)
523 518
524 if (!strcmp(dir, "left")) 519 if (!strcmp(dir, "left"))
525 { 520 {
526 if (!_is_horizontal(sd->orientation)) 521 if (!_is_horizontal(sd->dir))
527 return EINA_FALSE; 522 return EINA_FALSE;
528 if (!_is_inverted(sd->orientation)) 523 if (!_is_inverted(sd->dir))
529 _drag_down(obj, NULL, NULL, NULL); 524 _drag_down(obj, NULL, NULL, NULL);
530 else _drag_up(obj, NULL, NULL, NULL); 525 else _drag_up(obj, NULL, NULL, NULL);
531 } 526 }
532 else if (!strcmp(dir, "right")) 527 else if (!strcmp(dir, "right"))
533 { 528 {
534 if (!_is_horizontal(sd->orientation)) 529 if (!_is_horizontal(sd->dir))
535 return EINA_FALSE; 530 return EINA_FALSE;
536 if (!_is_inverted(sd->orientation)) 531 if (!_is_inverted(sd->dir))
537 _drag_up(obj, NULL, NULL, NULL); 532 _drag_up(obj, NULL, NULL, NULL);
538 else _drag_down(obj, NULL, NULL, NULL); 533 else _drag_down(obj, NULL, NULL, NULL);
539 } 534 }
540 else if (!strcmp(dir, "up")) 535 else if (!strcmp(dir, "up"))
541 { 536 {
542 if (_is_horizontal(sd->orientation)) 537 if (_is_horizontal(sd->dir))
543 return EINA_FALSE; 538 return EINA_FALSE;
544 if (_is_inverted(sd->orientation)) 539 if (_is_inverted(sd->dir))
545 _drag_up(obj, NULL, NULL, NULL); 540 _drag_up(obj, NULL, NULL, NULL);
546 else _drag_down(obj, NULL, NULL, NULL); 541 else _drag_down(obj, NULL, NULL, NULL);
547 } 542 }
548 else if (!strcmp(dir, "down")) 543 else if (!strcmp(dir, "down"))
549 { 544 {
550 if (_is_horizontal(sd->orientation)) 545 if (_is_horizontal(sd->dir))
551 return EINA_FALSE; 546 return EINA_FALSE;
552 if (_is_inverted(sd->orientation)) 547 if (_is_inverted(sd->dir))
553 _drag_down(obj, NULL, NULL, NULL); 548 _drag_down(obj, NULL, NULL, NULL);
554 else _drag_up(obj, NULL, NULL, NULL); 549 else _drag_up(obj, NULL, NULL, NULL);
555 } 550 }
@@ -619,14 +614,14 @@ _efl_ui_slider_elm_widget_activate(Eo *obj, Efl_Ui_Slider_Data *sd, Elm_Activate
619 if ((act == ELM_ACTIVATE_UP) || 614 if ((act == ELM_ACTIVATE_UP) ||
620 (act == ELM_ACTIVATE_RIGHT)) 615 (act == ELM_ACTIVATE_RIGHT))
621 { 616 {
622 if (!_is_inverted(sd->orientation)) 617 if (!_is_inverted(sd->dir))
623 _drag_up(obj, NULL, NULL, NULL); 618 _drag_up(obj, NULL, NULL, NULL);
624 else _drag_down(obj, NULL, NULL, NULL); 619 else _drag_down(obj, NULL, NULL, NULL);
625 } 620 }
626 else if ((act == ELM_ACTIVATE_DOWN) || 621 else if ((act == ELM_ACTIVATE_DOWN) ||
627 (act == ELM_ACTIVATE_LEFT)) 622 (act == ELM_ACTIVATE_LEFT))
628 { 623 {
629 if (!_is_inverted(sd->orientation)) 624 if (!_is_inverted(sd->dir))
630 _drag_down(obj, NULL, NULL, NULL); 625 _drag_down(obj, NULL, NULL, NULL);
631 else _drag_up(obj, NULL, NULL, NULL); 626 else _drag_up(obj, NULL, NULL, NULL);
632 } 627 }
@@ -710,7 +705,7 @@ _popup_add(Efl_Ui_Slider_Data *sd, Eo *obj, Evas_Object **popup,
710 // XXX popup needs to adapt to theme etc. 705 // XXX popup needs to adapt to theme etc.
711 *popup = edje_object_add(evas_object_evas_get(obj)); 706 *popup = edje_object_add(evas_object_evas_get(obj));
712 evas_object_smart_member_add(*popup, obj); 707 evas_object_smart_member_add(*popup, obj);
713 if (_is_horizontal(sd->orientation)) 708 if (_is_horizontal(sd->dir))
714 _elm_theme_set(elm_widget_theme_get(obj), *popup, "slider", "horizontal/popup", elm_widget_style_get(obj)); 709 _elm_theme_set(elm_widget_theme_get(obj), *popup, "slider", "horizontal/popup", elm_widget_style_get(obj));
715 else 710 else
716 _elm_theme_set(elm_widget_theme_get(obj), *popup, "slider", "vertical/popup", elm_widget_style_get(obj)); 711 _elm_theme_set(elm_widget_theme_get(obj), *popup, "slider", "vertical/popup", elm_widget_style_get(obj));
@@ -750,7 +745,7 @@ _efl_ui_slider_elm_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd)
750 EFL_UI_LAYOUT_DATA_GET(obj, ld); 745 EFL_UI_LAYOUT_DATA_GET(obj, ld);
751 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); 746 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
752 747
753 if (_is_horizontal(sd->orientation)) 748 if (_is_horizontal(sd->dir))
754 { 749 {
755 if (!sd->intvl_enable) 750 if (!sd->intvl_enable)
756 eina_stringshare_replace(&ld->group, "horizontal"); 751 eina_stringshare_replace(&ld->group, "horizontal");
@@ -802,7 +797,7 @@ _efl_ui_slider_elm_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd)
802 _popup_add(sd, obj, &sd->popup2, &sd->track2, EINA_TRUE); 797 _popup_add(sd, obj, &sd->popup2, &sd->track2, EINA_TRUE);
803 } 798 }
804 799
805 if (_is_horizontal(sd->orientation)) 800 if (_is_horizontal(sd->dir))
806 evas_object_size_hint_min_set 801 evas_object_size_hint_min_set
807 (sd->spacer, (double)sd->size * efl_ui_scale_get(obj) * 802 (sd->spacer, (double)sd->size * efl_ui_scale_get(obj) *
808 elm_config_scale_get(), 1); 803 elm_config_scale_get(), 1);
@@ -816,7 +811,7 @@ _efl_ui_slider_elm_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd)
816 else 811 else
817 elm_layout_signal_emit(obj, "elm,slider,range,disable", "elm"); 812 elm_layout_signal_emit(obj, "elm,slider,range,disable", "elm");
818 813
819 if (_is_inverted(sd->orientation)) 814 if (_is_inverted(sd->dir))
820 { 815 {
821 elm_layout_signal_emit(obj, "elm,state,inverted,on", "elm"); 816 elm_layout_signal_emit(obj, "elm,state,inverted,on", "elm");
822 if (sd->popup) 817 if (sd->popup)
@@ -890,7 +885,7 @@ _move_knob_on_mouse(Evas_Object *obj, double button_x, double button_y)
890 edje_object_part_drag_value_get 885 edje_object_part_drag_value_get
891 (wd->resize_obj, "elm.dragable2.slider", &posx2, &posy2); 886 (wd->resize_obj, "elm.dragable2.slider", &posx2, &posy2);
892 887
893 if (_is_horizontal(sd->orientation)) 888 if (_is_horizontal(sd->dir))
894 { 889 {
895 diff1 = fabs(button_x - posx); 890 diff1 = fabs(button_x - posx);
896 diff2 = fabs(button_x - posx2); 891 diff2 = fabs(button_x - posx2);
@@ -934,7 +929,7 @@ _spacer_down_cb(void *data,
934 evas_object_geometry_get(sd->spacer, &x, &y, &w, &h); 929 evas_object_geometry_get(sd->spacer, &x, &y, &w, &h);
935 sd->downx = ev->canvas.x - x; 930 sd->downx = ev->canvas.x - x;
936 sd->downy = ev->canvas.y - y; 931 sd->downy = ev->canvas.y - y;
937 if (_is_horizontal(sd->orientation)) 932 if (_is_horizontal(sd->dir))
938 { 933 {
939 button_x = ((double)ev->canvas.x - (double)x) / (double)w; 934 button_x = ((double)ev->canvas.x - (double)x) / (double)w;
940 if (button_x > 1) button_x = 1; 935 if (button_x > 1) button_x = 1;
@@ -973,7 +968,7 @@ _spacer_move_cb(void *data,
973 Evas_Coord d = 0; 968 Evas_Coord d = 0;
974 969
975 evas_object_geometry_get(sd->spacer, &x, &y, &w, &h); 970 evas_object_geometry_get(sd->spacer, &x, &y, &w, &h);
976 if (_is_horizontal(sd->orientation)) 971 if (_is_horizontal(sd->dir))
977 d = abs(ev->cur.canvas.x - x - sd->downx); 972 d = abs(ev->cur.canvas.x - x - sd->downx);
978 else d = abs(ev->cur.canvas.y - y - sd->downy); 973 else d = abs(ev->cur.canvas.y - y - sd->downy);
979 if (d > (_elm_config->thumbscroll_threshold - 1)) 974 if (d > (_elm_config->thumbscroll_threshold - 1))
@@ -1001,7 +996,7 @@ _spacer_move_cb(void *data,
1001 elm_slider_value_set(data, sd->val2); 996 elm_slider_value_set(data, sd->val2);
1002 return; 997 return;
1003 } 998 }
1004 if (_is_horizontal(sd->orientation)) 999 if (_is_horizontal(sd->dir))
1005 { 1000 {
1006 button_x = ((double)ev->cur.canvas.x - (double)x) / (double)w; 1001 button_x = ((double)ev->cur.canvas.x - (double)x) / (double)w;
1007 if (button_x > 1) button_x = 1; 1002 if (button_x > 1) button_x = 1;
@@ -1080,7 +1075,7 @@ _efl_ui_slider_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Slider_Data *sd)
1080{ 1075{
1081 elm_layout_freeze(obj); 1076 elm_layout_freeze(obj);
1082 1077
1083 if (_is_horizontal(sd->orientation)) 1078 if (_is_horizontal(sd->dir))
1084 evas_object_size_hint_min_set 1079 evas_object_size_hint_min_set
1085 (sd->spacer, (double)sd->size * efl_ui_scale_get(obj) * 1080 (sd->spacer, (double)sd->size * efl_ui_scale_get(obj) *
1086 elm_config_scale_get(), 1); 1081 elm_config_scale_get(), 1);
@@ -1148,7 +1143,7 @@ _efl_ui_slider_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Slider_Data *priv)
1148 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 1143 efl_canvas_group_add(efl_super(obj, MY_CLASS));
1149 elm_widget_sub_object_parent_add(obj); 1144 elm_widget_sub_object_parent_add(obj);
1150 1145
1151 priv->orientation = EFL_ORIENT_RIGHT; 1146 priv->dir = EFL_UI_DIR_RIGHT;
1152 priv->indicator_show = EINA_TRUE; 1147 priv->indicator_show = EINA_TRUE;
1153 priv->indicator_visible_mode = elm_config_slider_indicator_visible_mode_get(); 1148 priv->indicator_visible_mode = elm_config_slider_indicator_visible_mode_get();
1154 priv->val_max = 1.0; 1149 priv->val_max = 1.0;
@@ -1278,23 +1273,23 @@ _efl_ui_slider_efl_object_constructor(Eo *obj, Efl_Ui_Slider_Data *_pd EINA_UNUS
1278} 1273}
1279 1274
1280EOLIAN static void 1275EOLIAN static void
1281_efl_ui_slider_efl_orientation_orientation_set(Eo *obj, Efl_Ui_Slider_Data *sd, Efl_Orient dir) 1276_efl_ui_slider_efl_ui_direction_direction_set(Eo *obj, Efl_Ui_Slider_Data *sd, Efl_Ui_Dir dir)
1282{ 1277{
1283 sd->orientation = dir; 1278 sd->dir = dir;
1284 1279
1285 elm_obj_widget_theme_apply(obj); 1280 elm_obj_widget_theme_apply(obj);
1286} 1281}
1287 1282
1288EOLIAN static Efl_Orient 1283EOLIAN static Efl_Ui_Dir
1289_efl_ui_slider_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd) 1284_efl_ui_slider_efl_ui_direction_direction_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
1290{ 1285{
1291 return sd->orientation; 1286 return sd->dir;
1292} 1287}
1293 1288
1294EOLIAN static void 1289EOLIAN static void
1295_efl_ui_slider_efl_ui_range_span_size_set(Eo *obj, Efl_Ui_Slider_Data *sd, Evas_Coord size) 1290_efl_ui_slider_efl_ui_range_span_size_set(Eo *obj, Efl_Ui_Slider_Data *sd, Evas_Coord size)
1296{ 1291{
1297 if (_is_horizontal(sd->orientation)) 1292 if (_is_horizontal(sd->dir))
1298 efl_gfx_size_hint_min_set(efl_part(obj, "elm.swallow.bar"), size, 1); 1293 efl_gfx_size_hint_min_set(efl_part(obj, "elm.swallow.bar"), size, 1);
1299 else 1294 else
1300 efl_gfx_size_hint_min_set(efl_part(obj, "elm.swallow.bar"), 1, size); 1295 efl_gfx_size_hint_min_set(efl_part(obj, "elm.swallow.bar"), 1, size);
@@ -1590,7 +1585,7 @@ _span_size_set(Eo *obj, Efl_Ui_Slider_Data *sd, int w, int h)
1590{ 1585{
1591 Evas_Coord size; 1586 Evas_Coord size;
1592 1587
1593 if (_is_horizontal(sd->orientation)) 1588 if (_is_horizontal(sd->dir))
1594 size = w; 1589 size = w;
1595 else 1590 else
1596 size = h; 1591 size = h;
@@ -1633,7 +1628,7 @@ _efl_ui_slider_internal_part_efl_gfx_size_hint_hint_min_get(Eo *obj, Elm_Part_Da
1633 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); 1628 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS);
1634 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS); 1629 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS);
1635 1630
1636 if (_is_horizontal(sd->orientation)) 1631 if (_is_horizontal(sd->dir))
1637 { 1632 {
1638 if (w) *w = sd->size; 1633 if (w) *w = sd->size;
1639 if (h) *h = 1; 1634 if (h) *h = 1;
@@ -1684,19 +1679,19 @@ elm_slider_unit_format_get(const Evas_Object *obj)
1684EAPI void 1679EAPI void
1685elm_slider_horizontal_set(Evas_Object *obj, Eina_Bool horizontal) 1680elm_slider_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
1686{ 1681{
1687 Efl_Orient dir; 1682 Efl_Ui_Dir dir;
1688 EFL_UI_SLIDER_DATA_GET(obj, sd); 1683 EFL_UI_SLIDER_DATA_GET(obj, sd);
1689 1684
1690 dir = _orientation_get(horizontal, _is_inverted(sd->orientation)); 1685 dir = _direction_get(horizontal, _is_inverted(sd->dir));
1691 1686
1692 efl_orientation_set(obj, dir); 1687 efl_ui_direction_set(obj, dir);
1693} 1688}
1694 1689
1695EAPI Eina_Bool 1690EAPI Eina_Bool
1696elm_slider_horizontal_get(const Evas_Object *obj) 1691elm_slider_horizontal_get(const Evas_Object *obj)
1697{ 1692{
1698 Efl_Orient dir; 1693 Efl_Ui_Dir dir;
1699 dir = efl_orientation_get(obj); 1694 dir = efl_ui_direction_get(obj);
1700 1695
1701 return _is_horizontal(dir); 1696 return _is_horizontal(dir);
1702} 1697}
@@ -1716,19 +1711,19 @@ elm_slider_value_get(const Evas_Object *obj)
1716EAPI void 1711EAPI void
1717elm_slider_inverted_set(Evas_Object *obj, Eina_Bool inverted) 1712elm_slider_inverted_set(Evas_Object *obj, Eina_Bool inverted)
1718{ 1713{
1719 Efl_Orient dir; 1714 Efl_Ui_Dir dir;
1720 EFL_UI_SLIDER_DATA_GET(obj, sd); 1715 EFL_UI_SLIDER_DATA_GET(obj, sd);
1721 1716
1722 dir = _orientation_get(_is_horizontal(sd->orientation), inverted); 1717 dir = _direction_get(_is_horizontal(sd->dir), inverted);
1723 1718
1724 efl_orientation_set(obj, dir); 1719 efl_ui_direction_set(obj, dir);
1725} 1720}
1726 1721
1727EAPI Eina_Bool 1722EAPI Eina_Bool
1728elm_slider_inverted_get(const Evas_Object *obj) 1723elm_slider_inverted_get(const Evas_Object *obj)
1729{ 1724{
1730 Efl_Orient dir; 1725 Efl_Ui_Dir dir;
1731 dir = efl_orientation_get(obj); 1726 dir = efl_ui_direction_get(obj);
1732 1727
1733 return _is_inverted(dir); 1728 return _is_inverted(dir);
1734} 1729}
diff --git a/src/lib/elementary/efl_ui_slider.eo b/src/lib/elementary/efl_ui_slider.eo
index e5634f69b2..b549703ad0 100644
--- a/src/lib/elementary/efl_ui_slider.eo
+++ b/src/lib/elementary/efl_ui_slider.eo
@@ -1,8 +1,7 @@
1type slider_func_type: __undefined_type; [[Elementary slider function type]] 1type slider_func_type: __undefined_type; [[Elementary slider function type]]
2type slider_freefunc_type: __undefined_type; [[Elementary slider free function type]] 2type slider_freefunc_type: __undefined_type; [[Elementary slider free function type]]
3 3
4class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, 4class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Direction,
5 Efl.Orientation,
6 Elm.Interface.Atspi.Value, 5 Elm.Interface.Atspi.Value,
7 Elm.Interface.Atspi_Widget_Action) 6 Elm.Interface.Atspi_Widget_Action)
8{ 7{
@@ -128,7 +127,7 @@ class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range,
128 Efl.Ui.Range.range_min_max {get; set; } 127 Efl.Ui.Range.range_min_max {get; set; }
129 Efl.Ui.Range.range_interval_enabled { get; set; } 128 Efl.Ui.Range.range_interval_enabled { get; set; }
130 Efl.Ui.Range.range_interval { get; set; } 129 Efl.Ui.Range.range_interval { get; set; }
131 Efl.Orientation.orientation { get; set; } 130 Efl.Ui.Direction.direction { get; set; }
132 Elm.Interface.Atspi.Value.value_and_text { get; set; } 131 Elm.Interface.Atspi.Value.value_and_text { get; set; }
133 Elm.Interface.Atspi.Value.range { get; } 132 Elm.Interface.Atspi.Value.range { get; }
134 Elm.Interface.Atspi.Value.increment { get; } 133 Elm.Interface.Atspi.Value.increment { get; }
diff --git a/src/lib/elementary/efl_ui_slider_private.h b/src/lib/elementary/efl_ui_slider_private.h
index 5dc9c4bcf3..8e69d234fa 100644
--- a/src/lib/elementary/efl_ui_slider_private.h
+++ b/src/lib/elementary/efl_ui_slider_private.h
@@ -47,7 +47,7 @@ struct _Efl_Ui_Slider_Data
47 47
48 Evas_Coord size; 48 Evas_Coord size;
49 Evas_Coord downx, downy; 49 Evas_Coord downx, downy;
50 Efl_Orient orientation; 50 Efl_Ui_Dir dir;
51 51
52 double intvl_from, intvl_to; 52 double intvl_from, intvl_to;
53 53