summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwoochan lee <wc0917.lee@samsung.com>2015-10-01 19:50:23 +0900
committerChunEon Park <hermet@hermet.pe.kr>2015-10-01 19:53:40 +0900
commita20fe9cdedd0f06d9d6240c2a30a5390c22f9c32 (patch)
treed19d0f30e1036f8412e2da9635d96c8186387e89
parentde2ba979f7064ceccec4f65e6e99022594514e4c (diff)
multibuttonentry: Fix MBE item box min size calc error.
Summary: Before item packed again in mbe box. box calc own min height. In this case, there is no need to increase line number when entry is box item. Actually the min height of box calculated wrong here. @fix Test Plan: Give a color to internal box. Then items add. Check the internal box area got a wrong height value. Reviewers: Hermet, cedric Differential Revision: https://phab.enlightenment.org/D3102
-rw-r--r--src/lib/elc_multibuttonentry.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index f27ee33d3..8d485b9f4 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -1242,7 +1242,7 @@ _box_min_size_calculate(Evas_Object *box,
1242{ 1242{
1243 Evas_Coord mnw, mnh, w, minw, minh = 0, linew = 0, lineh = 0; 1243 Evas_Coord mnw, mnh, w, minw, minh = 0, linew = 0, lineh = 0;
1244 int line_num; 1244 int line_num;
1245 Eina_List *l, *l_next; 1245 Eina_List *l;
1246 Evas_Object_Box_Option *opt; 1246 Evas_Object_Box_Option *opt;
1247 1247
1248 evas_object_geometry_get(box, NULL, NULL, &w, NULL); 1248 evas_object_geometry_get(box, NULL, NULL, &w, NULL);
@@ -1262,15 +1262,6 @@ _box_min_size_calculate(Evas_Object *box,
1262 { 1262 {
1263 linew = mnw; 1263 linew = mnw;
1264 line_num++; 1264 line_num++;
1265
1266 l_next = eina_list_next(l);
1267 opt = eina_list_data_get(l_next);
1268 if (l_next && opt && opt->obj &&
1269 eo_isa(opt->obj, ELM_ENTRY_CLASS))
1270 {
1271 linew = 0;
1272 line_num++;
1273 }
1274 } 1265 }
1275 } 1266 }
1276 minh = lineh * line_num; 1267 minh = lineh * line_num;