[multibuttonentry] fixed some bugs when layouting box and after deleting all items

Change-Id: I432670f24fcd6b0f3b0ca70a9ba9b950a7b6933f

diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index d75413d..b2af502 100644 (file)
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -1229,7 +1229,8 @@ _box_layout(Evas_Object *o,
              yy = yyy;
              linew = lineww;
           }
-        linew += priv->pad.h;
+        if ((linew != 0) && (l != eina_list_last(priv->children)))
+          linew += priv->pad.h;
      }
 }
 
@@ -1459,7 +1460,7 @@ _item_del_pre_hook(Elm_Object_Item *it)
         elm_box_pack_end(sd->box, sd->guide);
         evas_object_show(sd->guide);
      }
-   if (!sd->items && !elm_object_focus_get(WIDGET(it)) &&
+   else if (!sd->items && !elm_object_focus_get(WIDGET(it)) &&
       sd->entry && !_entry_packed(WIDGET(it)) && sd->editable)
      {
         elm_box_pack_end(sd->box, sd->entry);