summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwoochan lee <wc0917.lee@samsung.com>2015-10-30 06:52:00 +0100
committerNicolas Aguirre <aguirre.nicolas@gmail.com>2015-11-12 10:15:03 +0100
commit0f5baa9ceb8e004fde9672bfad31bc2998694926 (patch)
tree3f029a73b0d75f2dbb20e5bd918b35b2b6c73653
parent9b12f79014f0d8146477bc8ae14377c92cebe956 (diff)
multibuttonentry: fix internal entry be an orphan when editable set API called.
Summary: When user called "elm_multibuttonetnry_editable_set()" API as false. the internal entry will be unpacked from box. Then called that API as true again. the internal entry just show without box packed. Also, editable set API should not work in MBE shrink mode. Test Plan: Alternately Call elm_multibuttonentry_ediable_set API as true, false. Then check the internal entry state. Reviewers: Hermet, cedric Differential Revision: https://phab.enlightenment.org/D3134 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
-rw-r--r--src/lib/elc_multibuttonentry.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 99305b164..3b4a2dbb9 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -1745,8 +1745,11 @@ _elm_multibuttonentry_editable_set(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Dat
1745 if (sd->editable == editable) return; 1745 if (sd->editable == editable) return;
1746 sd->editable = editable; 1746 sd->editable = editable;
1747 1747
1748 if (sd->editable) 1748 if (sd->editable && (sd->view_state != MULTIBUTTONENTRY_VIEW_SHRINK))
1749 evas_object_show(sd->entry); 1749 {
1750 elm_box_pack_end(sd->box, sd->entry);
1751 evas_object_show(sd->entry);
1752 }
1750 else 1753 else
1751 { 1754 {
1752 elm_box_unpack(sd->box, sd->entry); 1755 elm_box_unpack(sd->box, sd->entry);