summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-08-10 13:54:05 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-08-10 14:42:08 +0900
commita28b89304e51d6f857f90654f2cd40bb2d264196 (patch)
tree202ce627163842953edbf2530ac75755dd74eb02
parent63f599a47e507c39aa5596efcf3d2f3d790b7866 (diff)
toolbar: Switch to Efl.Ui.Dir (EO)
Ref T5870
-rw-r--r--src/lib/elementary/elm_toolbar.c95
-rw-r--r--src/lib/elementary/elm_toolbar.eo4
-rw-r--r--src/lib/elementary/elm_widget_toolbar.h2
3 files changed, 51 insertions, 50 deletions
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index efa8be816c..f01d888be7 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -168,7 +168,7 @@ _items_visibility_fix(Elm_Toolbar_Data *sd,
168 if (sd->more_item) 168 if (sd->more_item)
169 { 169 {
170 evas_object_geometry_get(sd->VIEW(more_item), NULL, NULL, &ciw, &cih); 170 evas_object_geometry_get(sd->VIEW(more_item), NULL, NULL, &ciw, &cih);
171 if (sd->orientation == EFL_ORIENT_VERTICAL) *iw += cih; 171 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) *iw += cih;
172 else *iw += ciw; 172 else *iw += ciw;
173 } 173 }
174 174
@@ -177,7 +177,7 @@ _items_visibility_fix(Elm_Toolbar_Data *sd,
177 if (it->prio.priority > sd->standard_priority) 177 if (it->prio.priority > sd->standard_priority)
178 { 178 {
179 evas_object_geometry_get(VIEW(it), NULL, NULL, &ciw, &cih); 179 evas_object_geometry_get(VIEW(it), NULL, NULL, &ciw, &cih);
180 if (sd->orientation == EFL_ORIENT_VERTICAL) *iw += cih; 180 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) *iw += cih;
181 else *iw += ciw; 181 else *iw += ciw;
182 it->prio.visible = (*iw <= vw); 182 it->prio.visible = (*iw <= vw);
183 it->in_box = sd->bx; 183 it->in_box = sd->bx;
@@ -335,7 +335,7 @@ _items_size_fit(Evas_Object *obj, Evas_Coord *bl, Evas_Coord view)
335 335
336 if (mw != -1 || mh != -1) 336 if (mw != -1 || mh != -1)
337 { 337 {
338 if (sd->orientation == EFL_ORIENT_VERTICAL) min = mh; 338 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) min = mh;
339 else min = mw; 339 else min = mw;
340 340
341 if ((!full) && ((sumf + min) > view)) 341 if ((!full) && ((sumf + min) > view))
@@ -433,7 +433,7 @@ _resize_job(void *data)
433 { 433 {
434 Evas_Coord iw = 0, ih = 0, more_w = 0, more_h = 0; 434 Evas_Coord iw = 0, ih = 0, more_w = 0, more_h = 0;
435 435
436 if (sd->orientation == EFL_ORIENT_VERTICAL) 436 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE))
437 { 437 {
438 h = vh; 438 h = vh;
439 _items_visibility_fix(sd, &ih, vh, &more); 439 _items_visibility_fix(sd, &ih, vh, &more);
@@ -446,7 +446,7 @@ _resize_job(void *data)
446 evas_object_geometry_get 446 evas_object_geometry_get
447 (sd->VIEW(more_item), NULL, NULL, &more_w, &more_h); 447 (sd->VIEW(more_item), NULL, NULL, &more_w, &more_h);
448 448
449 if (sd->orientation == EFL_ORIENT_VERTICAL) 449 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE))
450 { 450 {
451 if ((ih - more_h) <= vh) ih -= more_h; 451 if ((ih - more_h) <= vh) ih -= more_h;
452 } 452 }
@@ -459,8 +459,9 @@ _resize_job(void *data)
459 * individual items won't trigger a resize. Items are be 459 * individual items won't trigger a resize. Items are be
460 * readded below. */ 460 * readded below. */
461 evas_object_box_remove_all(sd->bx, EINA_FALSE); 461 evas_object_box_remove_all(sd->bx, EINA_FALSE);
462 if (((sd->orientation == EFL_ORIENT_VERTICAL) && (ih > vh)) || 462 if ((!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE) && (ih > vh)) ||
463 ((sd->orientation == EFL_ORIENT_HORIZONTAL) && (iw > vw)) || more) 463 ( efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE) && (iw > vw)) ||
464 more)
464 { 465 {
465 Evas_Object *menu; 466 Evas_Object *menu;
466 467
@@ -513,7 +514,7 @@ _resize_job(void *data)
513 { 514 {
514 Evas_Coord iw = 0, ih = 0; 515 Evas_Coord iw = 0, ih = 0;
515 516
516 if (sd->orientation == EFL_ORIENT_VERTICAL) 517 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE))
517 { 518 {
518 h = vh; 519 h = vh;
519 _items_visibility_fix(sd, &ih, vh, &more); 520 _items_visibility_fix(sd, &ih, vh, &more);
@@ -524,8 +525,9 @@ _resize_job(void *data)
524 _items_visibility_fix(sd, &iw, vw, &more); 525 _items_visibility_fix(sd, &iw, vw, &more);
525 } 526 }
526 evas_object_box_remove_all(sd->bx, EINA_FALSE); 527 evas_object_box_remove_all(sd->bx, EINA_FALSE);
527 if (((sd->orientation == EFL_ORIENT_VERTICAL) && (ih > vh)) || 528 if ((!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE) && (ih > vh)) ||
528 ((sd->orientation == EFL_ORIENT_HORIZONTAL) && (iw > vw)) || more) 529 ( efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE) && (iw > vw)) ||
530 more)
529 { 531 {
530 EINA_INLIST_FOREACH(sd->items, it) 532 EINA_INLIST_FOREACH(sd->items, it)
531 { 533 {
@@ -552,12 +554,12 @@ _resize_job(void *data)
552 { 554 {
553 Evas_Coord iw = 0, ih = 0; 555 Evas_Coord iw = 0, ih = 0;
554 556
555 if (sd->orientation == EFL_ORIENT_VERTICAL) 557 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE))
556 h = (vh >= mh) ? vh : mh; 558 h = (vh >= mh) ? vh : mh;
557 else 559 else
558 w = (vw >= mw) ? vw : mw; 560 w = (vw >= mw) ? vw : mw;
559 561
560 if (sd->orientation == EFL_ORIENT_VERTICAL) 562 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE))
561 _items_visibility_fix(sd, &ih, vh, &more); 563 _items_visibility_fix(sd, &ih, vh, &more);
562 else 564 else
563 _items_visibility_fix(sd, &iw, vw, &more); 565 _items_visibility_fix(sd, &iw, vw, &more);
@@ -582,7 +584,7 @@ _resize_job(void *data)
582 else 584 else
583 evas_object_hide(sd->VIEW(more_item)); 585 evas_object_hide(sd->VIEW(more_item));
584 586
585 if (sd->orientation == EFL_ORIENT_VERTICAL) 587 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE))
586 { 588 {
587 if (h > vh) _items_size_fit(obj, &h, vh); 589 if (h > vh) _items_size_fit(obj, &h, vh);
588 if (sd->item_count - sd->separator_count > 0) 590 if (sd->item_count - sd->separator_count > 0)
@@ -599,7 +601,7 @@ _resize_job(void *data)
599 } 601 }
600 else 602 else
601 { 603 {
602 if (sd->orientation == EFL_ORIENT_VERTICAL) 604 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE))
603 h = (vh >= mh) ? vh : mh; 605 h = (vh >= mh) ? vh : mh;
604 else 606 else
605 w = (vw >= mw) ? vw : mw; 607 w = (vw >= mw) ? vw : mw;
@@ -613,7 +615,7 @@ _resize_job(void *data)
613 615
614 if (sd->transverse_expanded) 616 if (sd->transverse_expanded)
615 { 617 {
616 if (sd->orientation == EFL_ORIENT_VERTICAL) 618 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE))
617 w = vw; 619 w = vw;
618 else 620 else
619 h = vh; 621 h = vh;
@@ -758,8 +760,8 @@ _elm_toolbar_nearest_visible_item_get(Evas_Object *obj, Elm_Object_Item *eo_it)
758 760
759 item_list = evas_object_box_children_get(sd->bx); 761 item_list = evas_object_box_children_get(sd->bx);
760 762
761 if ((sd->orientation == EFL_ORIENT_VERTICAL && (iy < vy)) || 763 if ((!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE) && (iy < vy)) ||
762 (sd->orientation == EFL_ORIENT_HORIZONTAL && (iw < vw)) || 764 ( efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE) && (iw < vw)) ||
763 search_next) 765 search_next)
764 { 766 {
765 while ((item_list = eina_list_next(item_list))) 767 while ((item_list = eina_list_next(item_list)))
@@ -1368,7 +1370,7 @@ _item_theme_hook(Evas_Object *obj,
1368 1370
1369 _item_shrink_signal_emit(view, sd->shrink_mode); 1371 _item_shrink_signal_emit(view, sd->shrink_mode);
1370 1372
1371 if (sd->orientation == EFL_ORIENT_VERTICAL) 1373 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE))
1372 elm_layout_signal_emit(view, "elm,orient,vertical", "elm"); 1374 elm_layout_signal_emit(view, "elm,orient,vertical", "elm");
1373 else 1375 else
1374 elm_layout_signal_emit(view, "elm,orient,horizontal", "elm"); 1376 elm_layout_signal_emit(view, "elm,orient,horizontal", "elm");
@@ -1378,7 +1380,7 @@ _item_theme_hook(Evas_Object *obj,
1378 elm_coords_finger_size_adjust(1, &mw, 1, &mh); 1380 elm_coords_finger_size_adjust(1, &mw, 1, &mh);
1379 if (sd->shrink_mode != ELM_TOOLBAR_SHRINK_EXPAND) 1381 if (sd->shrink_mode != ELM_TOOLBAR_SHRINK_EXPAND)
1380 { 1382 {
1381 if (sd->orientation == EFL_ORIENT_VERTICAL) 1383 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE))
1382 { 1384 {
1383 evas_object_size_hint_weight_set(view, EVAS_HINT_EXPAND, -1.0); 1385 evas_object_size_hint_weight_set(view, EVAS_HINT_EXPAND, -1.0);
1384 evas_object_size_hint_align_set 1386 evas_object_size_hint_align_set
@@ -1470,7 +1472,7 @@ _sizing_eval(Evas_Object *obj)
1470 } 1472 }
1471 else if (sd->shrink_mode == ELM_TOOLBAR_SHRINK_EXPAND) 1473 else if (sd->shrink_mode == ELM_TOOLBAR_SHRINK_EXPAND)
1472 { 1474 {
1473 if (sd->orientation == EFL_ORIENT_VERTICAL) 1475 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE))
1474 { 1476 {
1475 minw = minw_bx + (w - vw); 1477 minw = minw_bx + (w - vw);
1476 if (minh_bx <= vh) minh_bx = vh; 1478 if (minh_bx <= vh) minh_bx = vh;
@@ -1485,7 +1487,7 @@ _sizing_eval(Evas_Object *obj)
1485 } 1487 }
1486 else 1488 else
1487 { 1489 {
1488 if (sd->orientation == EFL_ORIENT_VERTICAL) 1490 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE))
1489 { 1491 {
1490 minw = minw_bx + (w - vw); 1492 minw = minw_bx + (w - vw);
1491 minh = h - vh; 1493 minh = h - vh;
@@ -1499,7 +1501,7 @@ _sizing_eval(Evas_Object *obj)
1499 1501
1500 if (sd->transverse_expanded) 1502 if (sd->transverse_expanded)
1501 { 1503 {
1502 if (sd->orientation == EFL_ORIENT_VERTICAL) 1504 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE))
1503 minw_bx = vw; 1505 minw_bx = vw;
1504 else 1506 else
1505 minh_bx = vh; 1507 minh_bx = vh;
@@ -1546,7 +1548,7 @@ _elm_toolbar_elm_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd)
1546 elm_widget_theme_object_set 1548 elm_widget_theme_object_set
1547 (obj, wd->resize_obj, "toolbar", "base", 1549 (obj, wd->resize_obj, "toolbar", "base",
1548 elm_widget_style_get(obj)); 1550 elm_widget_style_get(obj));
1549 if (sd->orientation == EFL_ORIENT_VERTICAL) 1551 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE))
1550 edje_object_signal_emit(wd->resize_obj, "elm,orient,vertical", "elm"); 1552 edje_object_signal_emit(wd->resize_obj, "elm,orient,vertical", "elm");
1551 else 1553 else
1552 edje_object_signal_emit(wd->resize_obj, "elm,orient,horizontal", "elm"); 1554 edje_object_signal_emit(wd->resize_obj, "elm,orient,horizontal", "elm");
@@ -1554,7 +1556,7 @@ _elm_toolbar_elm_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd)
1554 if (!elm_layout_theme_set 1556 if (!elm_layout_theme_set
1555 (sd->more, "toolbar", "more", elm_widget_style_get(obj))) 1557 (sd->more, "toolbar", "more", elm_widget_style_get(obj)))
1556 CRI("Failed to set layout!"); 1558 CRI("Failed to set layout!");
1557 if (sd->orientation == EFL_ORIENT_VERTICAL) 1559 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE))
1558 elm_object_signal_emit(sd->more, "elm,orient,vertical", "elm"); 1560 elm_object_signal_emit(sd->more, "elm,orient,vertical", "elm");
1559 else 1561 else
1560 elm_object_signal_emit(sd->more, "elm,orient,horizontal", "elm"); 1562 elm_object_signal_emit(sd->more, "elm,orient,horizontal", "elm");
@@ -2039,7 +2041,7 @@ _mouse_move_reorder(Elm_Toolbar_Item_Data *item,
2039 ELM_TOOLBAR_DATA_GET(WIDGET(item), sd); 2041 ELM_TOOLBAR_DATA_GET(WIDGET(item), sd);
2040 2042
2041 evas_object_geometry_get(VIEW(item), &x, &y, &w, &h); 2043 evas_object_geometry_get(VIEW(item), &x, &y, &w, &h);
2042 if (sd->orientation == EFL_ORIENT_VERTICAL) 2044 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE))
2043 evas_object_move(item->proxy, x, ev->cur.canvas.y - (h / 2)); 2045 evas_object_move(item->proxy, x, ev->cur.canvas.y - (h / 2));
2044 else 2046 else
2045 evas_object_move(item->proxy, ev->cur.canvas.x - (w / 2), y); 2047 evas_object_move(item->proxy, ev->cur.canvas.x - (w / 2), y);
@@ -2318,7 +2320,7 @@ _layout(Evas_Object *o,
2318 2320
2319 ELM_TOOLBAR_DATA_GET(obj, sd); 2321 ELM_TOOLBAR_DATA_GET(obj, sd);
2320 2322
2321 horizontal = sd->orientation ? EINA_TRUE : EINA_FALSE; 2323 horizontal = efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE);
2322 2324
2323 _els_box_layout 2325 _els_box_layout
2324 (o, priv, horizontal, sd->homogeneous, efl_ui_mirrored_get(obj)); 2326 (o, priv, horizontal, sd->homogeneous, efl_ui_mirrored_get(obj));
@@ -2819,7 +2821,7 @@ _elm_toolbar_efl_canvas_group_group_add(Eo *obj, Elm_Toolbar_Data *priv)
2819 elm_interface_scrollable_objects_set(obj, edje, priv->hit_rect); 2821 elm_interface_scrollable_objects_set(obj, edje, priv->hit_rect);
2820 2822
2821 priv->standard_priority = -99999; 2823 priv->standard_priority = -99999;
2822 priv->orientation = EFL_ORIENT_HORIZONTAL; 2824 priv->dir = EFL_UI_DIR_HORIZONTAL;
2823 2825
2824 elm_interface_scrollable_bounce_allow_set 2826 elm_interface_scrollable_bounce_allow_set
2825 (obj, _elm_config->thumbscroll_bounce_enable, EINA_FALSE); 2827 (obj, _elm_config->thumbscroll_bounce_enable, EINA_FALSE);
@@ -2857,7 +2859,7 @@ _elm_toolbar_efl_canvas_group_group_add(Eo *obj, Elm_Toolbar_Data *priv)
2857 priv->more = elm_layout_add(obj); 2859 priv->more = elm_layout_add(obj);
2858 if (!elm_layout_theme_set(priv->more, "toolbar", "more", "default")) 2860 if (!elm_layout_theme_set(priv->more, "toolbar", "more", "default"))
2859 CRI("Failed to set layout!"); 2861 CRI("Failed to set layout!");
2860 if (priv->orientation == EFL_ORIENT_VERTICAL) 2862 if (!efl_ui_dir_is_horizontal(priv->dir, EINA_TRUE))
2861 elm_object_signal_emit(priv->more, "elm,orient,vertical", "elm"); 2863 elm_object_signal_emit(priv->more, "elm,orient,vertical", "elm");
2862 else 2864 else
2863 elm_object_signal_emit(priv->more, "elm,orient,horizontal", "elm"); 2865 elm_object_signal_emit(priv->more, "elm,orient,horizontal", "elm");
@@ -3039,7 +3041,7 @@ _elm_toolbar_coordinates_adjust(Elm_Toolbar_Item_Data *it,
3039 *y = iy; 3041 *y = iy;
3040 *w = iw; 3042 *w = iw;
3041 *h = ih; 3043 *h = ih;
3042 if (sd->orientation == EFL_ORIENT_VERTICAL) 3044 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE))
3043 { 3045 {
3044 //TODO: Enhance it later. 3046 //TODO: Enhance it later.
3045 if ((ix < vx) || (ix + iw) > (vx + vw) || (iy + ih) > (vy + vh)) 3047 if ((ix < vx) || (ix + iw) > (vx + vw) || (iy + ih) > (vy + vh))
@@ -3643,7 +3645,7 @@ _elm_toolbar_menu_parent_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd)
3643EOLIAN static void 3645EOLIAN static void
3644_elm_toolbar_align_set(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd, double align) 3646_elm_toolbar_align_set(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd, double align)
3645{ 3647{
3646 if (sd->orientation == EFL_ORIENT_VERTICAL) 3648 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE))
3647 { 3649 {
3648 if (sd->align != align) 3650 if (sd->align != align)
3649 evas_object_box_align_set(sd->bx, 0.5, align); 3651 evas_object_box_align_set(sd->bx, 0.5, align);
@@ -3872,15 +3874,17 @@ _elm_toolbar_item_state_prev(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *ite
3872} 3874}
3873 3875
3874EOLIAN static void 3876EOLIAN static void
3875_elm_toolbar_efl_orientation_orientation_set(Eo *obj, Elm_Toolbar_Data *sd, Efl_Orient dir) 3877_elm_toolbar_efl_ui_direction_direction_set(Eo *obj, Elm_Toolbar_Data *sd, Efl_Ui_Dir dir)
3876{ 3878{
3877 if (dir != EFL_ORIENT_VERTICAL && 3879 // Adjust direction to be either horizontal or vertical.
3878 dir != EFL_ORIENT_HORIZONTAL) 3880 if (efl_ui_dir_is_horizontal(dir, EINA_TRUE))
3879 return; 3881 dir = EFL_UI_DIR_HORIZONTAL;
3882 else
3883 dir = EFL_UI_DIR_VERTICAL;
3880 3884
3881 sd->orientation = dir; 3885 sd->dir = dir;
3882 3886
3883 if (sd->orientation == EFL_ORIENT_VERTICAL) 3887 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE))
3884 evas_object_box_align_set(sd->bx, 0.5, sd->align); 3888 evas_object_box_align_set(sd->bx, 0.5, sd->align);
3885 else 3889 else
3886 evas_object_box_align_set(sd->bx, sd->align, 0.5); 3890 evas_object_box_align_set(sd->bx, sd->align, 0.5);
@@ -3888,23 +3892,23 @@ _elm_toolbar_efl_orientation_orientation_set(Eo *obj, Elm_Toolbar_Data *sd, Efl_
3888 _sizing_eval(obj); 3892 _sizing_eval(obj);
3889} 3893}
3890 3894
3891EOLIAN static Efl_Orient 3895EOLIAN static Efl_Ui_Dir
3892_elm_toolbar_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd) 3896_elm_toolbar_efl_ui_direction_direction_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd)
3893{ 3897{
3894 return sd->orientation; 3898 return sd->dir;
3895} 3899}
3896 3900
3897EAPI void 3901EAPI void
3898elm_toolbar_horizontal_set(Evas_Object *obj, Eina_Bool horizontal) 3902elm_toolbar_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
3899{ 3903{
3900 Efl_Orient orient; 3904 Efl_Ui_Dir dir;
3901 3905
3902 if (horizontal) 3906 if (horizontal)
3903 orient = EFL_ORIENT_HORIZONTAL; 3907 dir = EFL_UI_DIR_HORIZONTAL;
3904 else 3908 else
3905 orient = EFL_ORIENT_VERTICAL; 3909 dir = EFL_UI_DIR_VERTICAL;
3906 3910
3907 efl_orientation_set(obj, orient); 3911 efl_ui_direction_set(obj, dir);
3908} 3912}
3909 3913
3910EAPI Eina_Bool 3914EAPI Eina_Bool
@@ -3912,10 +3916,7 @@ elm_toolbar_horizontal_get(const Evas_Object *obj)
3912{ 3916{
3913 ELM_TOOLBAR_DATA_GET_OR_RETURN_VAL(obj, sd, EINA_FALSE); 3917 ELM_TOOLBAR_DATA_GET_OR_RETURN_VAL(obj, sd, EINA_FALSE);
3914 3918
3915 if (sd->orientation == EFL_ORIENT_VERTICAL) 3919 return efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE);
3916 return EINA_FALSE;
3917 else
3918 return EINA_TRUE;
3919} 3920}
3920 3921
3921EOLIAN static unsigned int 3922EOLIAN static unsigned int
diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo
index dca3526780..e70fee6177 100644
--- a/src/lib/elementary/elm_toolbar.eo
+++ b/src/lib/elementary/elm_toolbar.eo
@@ -23,7 +23,7 @@ enum Elm.Toolbar.Shrink_Mode
23 last [[Indicates error if returned by elm_toolbar_shrink_mode_get()]] 23 last [[Indicates error if returned by elm_toolbar_shrink_mode_get()]]
24} 24}
25 25
26class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation, 26class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Ui.Direction,
27 Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection, 27 Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection,
28 Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Menu) 28 Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Menu)
29{ 29{
@@ -329,7 +329,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation,
329 Elm.Widget.widget_event; 329 Elm.Widget.widget_event;
330 Elm.Widget.focus_highlight_geometry_get; 330 Elm.Widget.focus_highlight_geometry_get;
331 Elm.Widget.focused_item { get; } 331 Elm.Widget.focused_item { get; }
332 Efl.Orientation.orientation { get; set; } 332 Efl.Ui.Direction.direction { get; set; [[Only supports $vertical and $horizontal. Default is $horizontal.]] }
333 Elm.Widget.focus_register; 333 Elm.Widget.focus_register;
334 Elm.Interface.Atspi_Widget_Action.elm_actions { get; } 334 Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
335 Elm.Interface.Atspi_Accessible.children { get; } 335 Elm.Interface.Atspi_Accessible.children { get; }
diff --git a/src/lib/elementary/elm_widget_toolbar.h b/src/lib/elementary/elm_widget_toolbar.h
index 3af13ead82..61c110144f 100644
--- a/src/lib/elementary/elm_widget_toolbar.h
+++ b/src/lib/elementary/elm_widget_toolbar.h
@@ -49,7 +49,7 @@ struct _Elm_Toolbar_Data
49 Elm_Object_Select_Mode select_mode; 49 Elm_Object_Select_Mode select_mode;
50 Ecore_Timer *long_timer; 50 Ecore_Timer *long_timer;
51 Ecore_Job *resize_job; 51 Ecore_Job *resize_job;
52 Efl_Orient orientation; 52 Efl_Ui_Dir dir;
53 53
54 Eina_Bool long_press : 1; 54 Eina_Bool long_press : 1;
55 Eina_Bool homogeneous : 1; 55 Eina_Bool homogeneous : 1;