summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshilpa.singh <shilpa.singh@samsung.com>2014-11-09 18:01:15 +0900
committerDaniel Juyung Seo <seojuyung2@gmail.com>2014-11-09 18:02:37 +0900
commitbdb74ed9b685a12f1d28cac36dc150bfdcadb0ea (patch)
treea2237ac0d3c074001a2716ff7bb4689ad6c46dfc
parentd16ce50bf7bc398df4b8ed15248cf46747f97c54 (diff)
elm_box_align_set API fix
Summary: Issue: elm_box_align_set APIs not working well Solution: hint_set should not be called instead evas box align APIs have to be used @fix Test Plan: elementary test demo first page, though align is set as 0.0 0.5 it always shows as 0.5 Reviewers: Hermet, raster, seoz Subscribers: rajeshps, govi Differential Revision: https://phab.enlightenment.org/D1622
-rw-r--r--src/lib/elm_box.c6
-rw-r--r--src/lib/els_box.c2
2 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/elm_box.c b/src/lib/elm_box.c
index b6a84dbef..41d536bfa 100644
--- a/src/lib/elm_box.c
+++ b/src/lib/elm_box.c
@@ -678,8 +678,7 @@ _elm_box_align_set(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED, double horizontal, do
678{ 678{
679 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 679 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
680 680
681 evas_object_size_hint_align_set 681 evas_object_box_align_set(wd->resize_obj, horizontal, vertical);
682 (wd->resize_obj, horizontal, vertical);
683} 682}
684 683
685EOLIAN static void 684EOLIAN static void
@@ -687,8 +686,7 @@ _elm_box_align_get(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED, double *horizontal, d
687{ 686{
688 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 687 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
689 688
690 evas_object_size_hint_align_get 689 evas_object_box_align_get(wd->resize_obj, horizontal, vertical);
691 (wd->resize_obj, horizontal, vertical);
692} 690}
693 691
694EOLIAN static void 692EOLIAN static void
diff --git a/src/lib/els_box.c b/src/lib/els_box.c
index be0edc9b6..3d0566bc1 100644
--- a/src/lib/els_box.c
+++ b/src/lib/els_box.c
@@ -152,7 +152,7 @@ _els_box_layout(Evas_Object *o, Evas_Object_Box_Data *priv, Eina_Bool horizontal
152 } 152 }
153 if (!expand) 153 if (!expand)
154 { 154 {
155 evas_object_size_hint_align_get(o, &ax, &ay); 155 evas_object_box_align_get(o, &ax, &ay);
156 if (rtl) ax = 1.0 - ax; 156 if (rtl) ax = 1.0 - ax;
157 if (horizontal) 157 if (horizontal)
158 { 158 {