cedric pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=fbed0fa5e34b84bdccc2dcf519edb7f54c3c9108
commit fbed0fa5e34b84bdccc2dcf519edb7f54c3c9108
Author: woochan lee <wc0917....@samsung.com>
Date: Tue Jul 28 22:54:21 2015 +0200
multibuttonentry: fix bug with uneditable MBE use case.
Summary:
If there is a uneditable MBE, the MBE doesn't have to get a entry inside of
the box.
It breaks MBE box layout, resize logic.
And check the box focus, entry visible is not enough to cover MBE is
uneditable case.
If MBE is uneditable, box_resize callback called when item added. in this
case,
we need to check what view type user want. if its not shrink view here, do
not make
MBE to shrink mode.
@fix
Test Plan: Run elementary_test -> execute multibuttonentry sample with
editable set as false.
Reviewers: Hermet, seoz, woohyun, cedric
Reviewed By: cedric
Differential Revision: https://phab.enlightenment.org/D2824
Signed-off-by: Cedric BAIL <ced...@osg.samsung.com>
---
src/lib/elc_multibuttonentry.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 8559607..a9c87cf 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -952,7 +952,8 @@ _box_resize_cb(void *data,
}
}
}
- if (!elm_object_focus_get(data) && !evas_object_visible_get(sd->entry))
+ if (sd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK &&
+ !elm_object_focus_get(data) && !evas_object_visible_get(sd->entry))
{
_shrink_mode_set(data, EINA_TRUE);
}
@@ -1695,6 +1696,7 @@ _elm_multibuttonentry_editable_set(Eo *obj EINA_UNUSED,
Elm_Multibuttonentry_Dat
evas_object_show(sd->entry);
else
{
+ elm_box_unpack(sd->box, sd->entry);
elm_entry_input_panel_hide(sd->entry);
evas_object_hide(sd->entry);
}
--
