summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTaehyub Kim <taehyub.kim@samsung.com>2019-09-03 19:47:01 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2019-09-03 19:47:02 +0900
commit10a5d83e83e39b943aab6bca5e999e5862c6dcbd (patch)
tree539dc4725207dd7787d43915f3d0280a0129184e
parentd1dbb791e835e4dd144e74941e1af5761fb86880 (diff)
downloadefl-10a5d83e83e39b943aab6bca5e999e5862c6dcbd.tar.gz
elm_popup: calculate the label min size of popup before the popup group calculation
Summary: consider the label min width size before the popup group calculation @fix Test Plan: 1. run elementary_test popup Reviewers: Jaehyun_Cho, woohyun Reviewed By: Jaehyun_Cho Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9818
-rw-r--r--src/lib/elementary/elc_popup.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 8117d15b9b..df9e4e70e8 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -1039,8 +1039,11 @@ _content_text_set(Evas_Object *obj,
evas_object_event_callback_add
(sd->text_content_obj, EVAS_CALLBACK_DEL, _on_text_content_del, obj);
- elm_label_line_wrap_set(sd->text_content_obj, sd->content_text_wrap_type);
+ elm_label_line_wrap_set(sd->text_content_obj, ELM_WRAP_NONE);
elm_object_text_set(sd->text_content_obj, text);
+ efl_canvas_group_calculate(sd->text_content_obj);
+ elm_label_line_wrap_set(sd->text_content_obj, sd->content_text_wrap_type);
+
evas_object_size_hint_weight_set
(sd->text_content_obj, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set