summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_object_box.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/evas/canvas/evas_object_box.c')
-rw-r--r--src/lib/evas/canvas/evas_object_box.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index abda3fa..cb65f58 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -608,7 +608,7 @@ _sizing_eval(Evas_Object *obj)
608 Evas_Coord minw, minh, maxw, maxh; 608 Evas_Coord minw, minh, maxw, maxh;
609 Evas_Coord w, h; 609 Evas_Coord w, h;
610 610
611 efl_gfx_size_hint_combined_min_get(obj, &minw, &minh); 611 evas_object_size_hint_combined_min_get(obj, &minw, &minh);
612 evas_object_size_hint_max_get(obj, &maxw, &maxh); 612 evas_object_size_hint_max_get(obj, &maxw, &maxh);
613 evas_object_geometry_get(obj, NULL, NULL, &w, &h); 613 evas_object_geometry_get(obj, NULL, NULL, &w, &h);
614 614
@@ -638,7 +638,7 @@ _evas_object_box_layout_horizontal_weight_apply(Evas_Object_Box_Data *priv, Evas
638 { 638 {
639 int min_w; 639 int min_w;
640 640
641 efl_gfx_size_hint_combined_min_get(o, &min_w, NULL); 641 evas_object_size_hint_combined_min_get(o, &min_w, NULL);
642 evas_object_resize(o, min_w, h); 642 evas_object_resize(o, min_w, h);
643 } 643 }
644 else 644 else
@@ -718,7 +718,7 @@ _evas_box_layout_horizontal(Eo *o, Evas_Object_Box_Data *priv, Evas_Object_Box_D
718 (opt->obj, &padding_l, &padding_r, NULL, NULL); 718 (opt->obj, &padding_l, &padding_r, NULL, NULL);
719 req_w += padding_l + padding_r; 719 req_w += padding_l + padding_r;
720 720
721 efl_gfx_size_hint_combined_min_get(opt->obj, &minw, NULL); 721 evas_object_size_hint_combined_min_get(opt->obj, &minw, NULL);
722 if (minw > 0) totalminw += minw + padding_l + padding_r; 722 if (minw > 0) totalminw += minw + padding_l + padding_r;
723 if (EINA_DBL_EQ(weight_x, 0.0)) 723 if (EINA_DBL_EQ(weight_x, 0.0))
724 { 724 {
@@ -760,7 +760,7 @@ _evas_box_layout_horizontal(Eo *o, Evas_Object_Box_Data *priv, Evas_Object_Box_D
760 (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b); 760 (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b);
761 evas_object_size_hint_max_get(opt->obj, NULL, &max_h); 761 evas_object_size_hint_max_get(opt->obj, NULL, &max_h);
762 762
763 efl_gfx_size_hint_combined_min_get(opt->obj, &minw, &minh); 763 evas_object_size_hint_combined_min_get(opt->obj, &minw, &minh);
764 evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h); 764 evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h);
765 765
766 off_x = padding_l; 766 off_x = padding_l;
@@ -804,7 +804,7 @@ _evas_object_box_layout_vertical_weight_apply(Evas_Object_Box_Data *priv, Evas_O
804 { 804 {
805 int min_h; 805 int min_h;
806 806
807 efl_gfx_size_hint_combined_min_get(o, NULL, &min_h); 807 evas_object_size_hint_combined_min_get(o, NULL, &min_h);
808 evas_object_resize(o, w, min_h); 808 evas_object_resize(o, w, min_h);
809 } 809 }
810 else 810 else
@@ -884,7 +884,7 @@ _evas_box_layout_vertical(Eo *o, Evas_Object_Box_Data *priv, Evas_Object_Box_Dat
884 (opt->obj, NULL, NULL, &padding_t, &padding_b); 884 (opt->obj, NULL, NULL, &padding_t, &padding_b);
885 req_h += padding_t + padding_b; 885 req_h += padding_t + padding_b;
886 886
887 efl_gfx_size_hint_combined_min_get(opt->obj, NULL, &minh); 887 evas_object_size_hint_combined_min_get(opt->obj, NULL, &minh);
888 if (minh > 0) totalminh += minh + padding_t + padding_b; 888 if (minh > 0) totalminh += minh + padding_t + padding_b;
889 if (EINA_DBL_EQ(weight_y, 0.0)) 889 if (EINA_DBL_EQ(weight_y, 0.0))
890 { 890 {
@@ -926,7 +926,7 @@ _evas_box_layout_vertical(Eo *o, Evas_Object_Box_Data *priv, Evas_Object_Box_Dat
926 (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b); 926 (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b);
927 evas_object_size_hint_max_get(opt->obj, &max_w, NULL); 927 evas_object_size_hint_max_get(opt->obj, &max_w, NULL);
928 928
929 efl_gfx_size_hint_combined_min_get(opt->obj, &minw, &minh); 929 evas_object_size_hint_combined_min_get(opt->obj, &minw, &minh);
930 evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h); 930 evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h);
931 931
932 off_y = padding_t; 932 off_y = padding_t;
@@ -986,7 +986,7 @@ _evas_box_layout_homogeneous_horizontal(Eo *o, Evas_Object_Box_Data *priv, Evas_
986 evas_object_size_hint_padding_get 986 evas_object_size_hint_padding_get
987 (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b); 987 (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b);
988 evas_object_size_hint_max_get(opt->obj, &max_w, &max_h); 988 evas_object_size_hint_max_get(opt->obj, &max_w, &max_h);
989 efl_gfx_size_hint_combined_min_get(opt->obj, &min_w, NULL); 989 evas_object_size_hint_combined_min_get(opt->obj, &min_w, NULL);
990 990
991 _sizing_eval(opt->obj); 991 _sizing_eval(opt->obj);
992 evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h); 992 evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h);
@@ -1050,7 +1050,7 @@ _evas_box_layout_homogeneous_vertical(Eo *o, Evas_Object_Box_Data *priv, Evas_Ob
1050 evas_object_size_hint_padding_get 1050 evas_object_size_hint_padding_get
1051 (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b); 1051 (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b);
1052 evas_object_size_hint_max_get(opt->obj, &max_w, &max_h); 1052 evas_object_size_hint_max_get(opt->obj, &max_w, &max_h);
1053 efl_gfx_size_hint_combined_min_get(opt->obj, NULL, &min_h); 1053 evas_object_size_hint_combined_min_get(opt->obj, NULL, &min_h);
1054 1054
1055 _sizing_eval(opt->obj); 1055 _sizing_eval(opt->obj);
1056 evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h); 1056 evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h);
@@ -1136,7 +1136,7 @@ _evas_box_layout_homogeneous_max_size_horizontal(Eo *o, Evas_Object_Box_Data *pr
1136 evas_object_size_hint_padding_get 1136 evas_object_size_hint_padding_get
1137 (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b); 1137 (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b);
1138 evas_object_size_hint_max_get(opt->obj, &max_w, &max_h); 1138 evas_object_size_hint_max_get(opt->obj, &max_w, &max_h);
1139 efl_gfx_size_hint_combined_min_get(opt->obj, &min_w, NULL); 1139 evas_object_size_hint_combined_min_get(opt->obj, &min_w, NULL);
1140 1140
1141 evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h); 1141 evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h);
1142 1142
@@ -1223,7 +1223,7 @@ _evas_box_layout_homogeneous_max_size_vertical(Eo *o, Evas_Object_Box_Data *priv
1223 evas_object_size_hint_padding_get 1223 evas_object_size_hint_padding_get
1224 (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b); 1224 (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b);
1225 evas_object_size_hint_max_get(opt->obj, &max_w, &max_h); 1225 evas_object_size_hint_max_get(opt->obj, &max_w, &max_h);
1226 efl_gfx_size_hint_combined_min_get(opt->obj, NULL, &min_h); 1226 evas_object_size_hint_combined_min_get(opt->obj, NULL, &min_h);
1227 1227
1228 evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h); 1228 evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h);
1229 1229
@@ -1634,7 +1634,7 @@ _evas_box_layout_stack(Eo *o, Evas_Object_Box_Data *priv, Evas_Object_Box_Data *
1634 evas_object_size_hint_padding_get 1634 evas_object_size_hint_padding_get
1635 (child, &pad_l, &pad_r, &pad_t, &pad_b); 1635 (child, &pad_l, &pad_r, &pad_t, &pad_b);
1636 evas_object_size_hint_max_get(child, &max_w, &max_h); 1636 evas_object_size_hint_max_get(child, &max_w, &max_h);
1637 efl_gfx_size_hint_combined_min_get(child, &min_w, &min_h); 1637 evas_object_size_hint_combined_min_get(child, &min_w, &min_h);
1638 1638
1639 _sizing_eval(opt->obj); 1639 _sizing_eval(opt->obj);
1640 evas_object_geometry_get(child, NULL, NULL, &child_w, &child_h); 1640 evas_object_geometry_get(child, NULL, NULL, &child_w, &child_h);