hermet pushed a commit to branch elementary-1.15.

http://git.enlightenment.org/core/elementary.git/commit/?id=a20fe9cdedd0f06d9d6240c2a30a5390c22f9c32

commit a20fe9cdedd0f06d9d6240c2a30a5390c22f9c32
Author: woochan lee <wc0917....@samsung.com>
Date:   Thu Oct 1 19:50:23 2015 +0900

    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
---
 src/lib/elc_multibuttonentry.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index f27ee33..8d485b9 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -1242,7 +1242,7 @@ _box_min_size_calculate(Evas_Object *box,
 {
    Evas_Coord mnw, mnh, w, minw, minh = 0, linew = 0, lineh = 0;
    int line_num;
-   Eina_List *l, *l_next;
+   Eina_List *l;
    Evas_Object_Box_Option *opt;
 
    evas_object_geometry_get(box, NULL, NULL, &w, NULL);
@@ -1262,15 +1262,6 @@ _box_min_size_calculate(Evas_Object *box,
           {
              linew = mnw;
              line_num++;
-
-             l_next = eina_list_next(l);
-             opt = eina_list_data_get(l_next);
-             if (l_next && opt && opt->obj &&
-                 eo_isa(opt->obj, ELM_ENTRY_CLASS))
-               {
-                  linew = 0;
-                  line_num++;
-               }
           }
      }
    minh = lineh * line_num;

-- 


Reply via email to