kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Andrii Kroitor 2014-11-13 00:14:57 +09:00 committed by Daniel Juyung Seo
parent 2f20ed2fcc
commit 81bd6ed6e1
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/elementary/src/lib/elm_panel.c
View File

@ -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);

14
legacy/elementary/src/lib/elm_toolbar.c
View File

@ -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
@ -3453,12 +3453,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;
}
@ -3707,9 +3707,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);
}