diff options
| author | Andrii Kroitor <an.kroitor@samsung.com> | 2014-11-13 00:14:57 +0900 |
|---|---|---|
| committer | Daniel Juyung Seo <seojuyung2@gmail.com> | 2014-11-13 22:38:53 +0900 |
| commit | 9b697c1452bcf0a76a2693d16c8fd4d533579d4c (patch) | |
| tree | 7745b7555bae216462df0150e265d94ea91cbf62 | |
| parent | f8f84dd0d48f99c9941ea73e2375dfd51d08b8ad (diff) | |
| download | elementary-9b697c1452bcf0a76a2693d16c8fd4d533579d4c.tar.gz | |
elm_box: inappropriate size_hint_align value usage fix
Summary:
size_hint_align was used instead of evas_box's internal value for aligning
of internal items. Because of that layout functions of elm_box and evas_box
were incompatable
Fixed elm_box, els_box layout and widgets that used this behaviour.
@fix
Test Plan:
Run "elementary_test". All buttons should be left-aligned
"elm_box_align_set(tbx2, 0.0, 0.5);" (test.c:332)
Reviewers: cedric, Hermet, stefan_schmidt, seoz
Reviewed By: seoz
Subscribers: shilpasingh, reutskiy.v.v
Differential Revision: https://phab.enlightenment.org/D1512
| -rw-r--r-- | src/lib/elm_panel.c | 1 | ||||
| -rw-r--r-- | src/lib/elm_toolbar.c | 14 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c index c2ef9c55d..31da9bcdc 100644 --- a/src/lib/elm_panel.c +++ b/src/lib/elm_panel.c @@ -959,7 +959,6 @@ _elm_panel_evas_object_smart_add(Eo *obj, Elm_Panel_Data *priv) eo_do(obj, elm_obj_widget_theme_apply()); priv->bx = evas_object_box_add(evas_object_evas_get(obj)); - evas_object_size_hint_align_set(priv->bx, 0.5, 0.5); evas_object_box_layout_set(priv->bx, _box_layout_cb, priv, NULL); evas_object_show(priv->bx); diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c index 29e1171b4..57adc4ae6 100644 --- a/src/lib/elm_toolbar.c +++ b/src/lib/elm_toolbar.c @@ -2757,7 +2757,7 @@ _elm_toolbar_evas_object_smart_add(Eo *obj, Elm_Toolbar_Data *priv) priv->align = 0.5; priv->bx = evas_object_box_add(evas_object_evas_get(obj)); - evas_object_size_hint_align_set(priv->bx, priv->align, 0.5); + evas_object_box_align_set(priv->bx, priv->align, 0.5); evas_object_box_layout_set(priv->bx, _layout, obj, NULL); elm_widget_sub_object_add(obj, priv->bx); eo_do(obj, elm_interface_scrollable_content_set(priv->bx)); @@ -2775,7 +2775,7 @@ _elm_toolbar_evas_object_smart_add(Eo *obj, Elm_Toolbar_Data *priv) evas_object_show(priv->more); priv->bx_more = evas_object_box_add(evas_object_evas_get(obj)); - evas_object_size_hint_align_set(priv->bx_more, priv->align, 0.5); + evas_object_box_align_set(priv->bx_more, priv->align, 0.5); evas_object_box_layout_set(priv->bx_more, _layout, obj, NULL); elm_widget_sub_object_add(obj, priv->bx_more); elm_layout_content_set @@ -2783,7 +2783,7 @@ _elm_toolbar_evas_object_smart_add(Eo *obj, Elm_Toolbar_Data *priv) evas_object_show(priv->bx_more); priv->bx_more2 = evas_object_box_add(evas_object_evas_get(obj)); - evas_object_size_hint_align_set(priv->bx_more2, priv->align, 0.5); + evas_object_box_align_set(priv->bx_more2, priv->align, 0.5); evas_object_box_layout_set(priv->bx_more2, _layout, obj, NULL); elm_widget_sub_object_add(obj, priv->bx_more2); elm_layout_content_set @@ -3464,12 +3464,12 @@ _elm_toolbar_align_set(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd, double align) if (sd->vertical) { if (sd->align != align) - evas_object_size_hint_align_set(sd->bx, 0.5, align); + evas_object_box_align_set(sd->bx, 0.5, align); } else { if (sd->align != align) - evas_object_size_hint_align_set(sd->bx, align, 0.5); + evas_object_box_align_set(sd->bx, align, 0.5); } sd->align = align; } @@ -3730,9 +3730,9 @@ _elm_toolbar_horizontal_set(Eo *obj, Elm_Toolbar_Data *sd, Eina_Bool horizontal) if (!horizontal == sd->vertical) return; sd->vertical = !horizontal; if (sd->vertical) - evas_object_size_hint_align_set(sd->bx, 0.5, sd->align); + evas_object_box_align_set(sd->bx, 0.5, sd->align); else - evas_object_size_hint_align_set(sd->bx, sd->align, 0.5); + evas_object_box_align_set(sd->bx, sd->align, 0.5); _sizing_eval(obj); } |