summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2017-11-24 19:52:54 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2017-11-24 19:52:54 +0900
commitfebe5995495cbf427a0cad57d150d6016500c6bf (patch)
treeab5d81a0a76b7353158b05c2b238630559ba3928
parent00c3f110b0bc60c53cd081238a5e9227f7d9a90d (diff)
-rw-r--r--src/bin/elementary/test_ui_popup.c4
-rw-r--r--src/lib/elementary/efl_ui_popup.c3
-rw-r--r--src/lib/elementary/efl_ui_popup_alert.c17
-rw-r--r--src/lib/elementary/efl_ui_popup_alert_scroll.c17
-rw-r--r--src/lib/elementary/efl_ui_popup_alert_text.c189
-rw-r--r--src/lib/elementary/efl_ui_popup_alert_text.eo1
-rw-r--r--src/lib/elementary/efl_ui_popup_alert_text_private.h4
7 files changed, 158 insertions, 77 deletions
diff --git a/src/bin/elementary/test_ui_popup.c b/src/bin/elementary/test_ui_popup.c
index 04651f8cb2..99e278bac5 100644
--- a/src/bin/elementary/test_ui_popup.c
+++ b/src/bin/elementary/test_ui_popup.c
@@ -461,9 +461,11 @@ _alert_text_case3_cb(void *data, const Efl_Event *ev EINA_UNUSED)
461 efl_text_set(efl_part(efl_ui_popup, "title"), "title"); 461 efl_text_set(efl_part(efl_ui_popup, "title"), "title");
462 efl_text_set(efl_ui_popup, "This is Text Popup"); 462 efl_text_set(efl_ui_popup, "This is Text Popup");
463 463
464 printf("\nSTART!\n\n");
464 efl_ui_popup_alert_button_set(efl_ui_popup, EFL_UI_POPUP_ALERT_BUTTON_POSITIVE, "Yes"); 465 efl_ui_popup_alert_button_set(efl_ui_popup, EFL_UI_POPUP_ALERT_BUTTON_POSITIVE, "Yes");
465 efl_ui_popup_alert_button_set(efl_ui_popup, EFL_UI_POPUP_ALERT_BUTTON_NEGATIVE, "No"); 466 efl_ui_popup_alert_button_set(efl_ui_popup, EFL_UI_POPUP_ALERT_BUTTON_NEGATIVE, "No");
466 efl_ui_popup_alert_button_set(efl_ui_popup, EFL_UI_POPUP_ALERT_BUTTON_USER, "Cancel"); 467 efl_ui_popup_alert_button_set(efl_ui_popup, EFL_UI_POPUP_ALERT_BUTTON_USER, "Cancel");
468 printf("\nFINISH!\n\n");
467 469
468 efl_event_callback_add(efl_ui_popup, EFL_UI_POPUP_ALERT_EVENT_CLICKED, efl_ui_popup_alert_text_clicked_cb, NULL); 470 efl_event_callback_add(efl_ui_popup, EFL_UI_POPUP_ALERT_EVENT_CLICKED, efl_ui_popup_alert_text_clicked_cb, NULL);
469} 471}
@@ -479,9 +481,11 @@ _alert_text_case4_cb(void *data, const Efl_Event *ev EINA_UNUSED)
479 efl_text_set(efl_part(efl_ui_popup, "title"), "title"); 481 efl_text_set(efl_part(efl_ui_popup, "title"), "title");
480 efl_text_set(efl_ui_popup, "This is Text Popup"); 482 efl_text_set(efl_ui_popup, "This is Text Popup");
481 483
484 printf("\nSTART!\n\n");
482 efl_ui_popup_alert_button_set(efl_ui_popup, EFL_UI_POPUP_ALERT_BUTTON_POSITIVE, "Yes"); 485 efl_ui_popup_alert_button_set(efl_ui_popup, EFL_UI_POPUP_ALERT_BUTTON_POSITIVE, "Yes");
483 efl_ui_popup_alert_button_set(efl_ui_popup, EFL_UI_POPUP_ALERT_BUTTON_NEGATIVE, "No"); 486 efl_ui_popup_alert_button_set(efl_ui_popup, EFL_UI_POPUP_ALERT_BUTTON_NEGATIVE, "No");
484 efl_ui_popup_alert_button_set(efl_ui_popup, EFL_UI_POPUP_ALERT_BUTTON_USER, "Cancel"); 487 efl_ui_popup_alert_button_set(efl_ui_popup, EFL_UI_POPUP_ALERT_BUTTON_USER, "Cancel");
488 printf("\nFINISH!\n\n");
485 489
486 efl_ui_popup_alert_text_expandable_set(efl_ui_popup, EINA_TRUE, EINA_FALSE); 490 efl_ui_popup_alert_text_expandable_set(efl_ui_popup, EINA_TRUE, EINA_FALSE);
487 491
diff --git a/src/lib/elementary/efl_ui_popup.c b/src/lib/elementary/efl_ui_popup.c
index e2b0f9d330..9166d2d880 100644
--- a/src/lib/elementary/efl_ui_popup.c
+++ b/src/lib/elementary/efl_ui_popup.c
@@ -239,7 +239,7 @@ _efl_ui_popup_efl_object_destructor(Eo *obj, Efl_Ui_Popup_Data *pd)
239} 239}
240 240
241EOLIAN static void 241EOLIAN static void
242_efl_ui_popup_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED) 242_efl_ui_popup_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Popup_Data *pd)
243{ 243{
244 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 244 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
245 Evas_Coord minw = -1, minh = -1; 245 Evas_Coord minw = -1, minh = -1;
@@ -254,6 +254,7 @@ _efl_ui_popup_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED)
254 Eina_Size2D new_size; 254 Eina_Size2D new_size;
255 new_size.w = (minw > size.w ? minw : size.w); 255 new_size.w = (minw > size.w ? minw : size.w);
256 new_size.h = (minh > size.h ? minh : size.h); 256 new_size.h = (minh > size.h ? minh : size.h);
257
257 efl_gfx_size_set(obj, new_size); 258 efl_gfx_size_set(obj, new_size);
258 259
259 _calc_align(obj); 260 _calc_align(obj);
diff --git a/src/lib/elementary/efl_ui_popup_alert.c b/src/lib/elementary/efl_ui_popup_alert.c
index 13e708f50b..da1e8cc65b 100644
--- a/src/lib/elementary/efl_ui_popup_alert.c
+++ b/src/lib/elementary/efl_ui_popup_alert.c
@@ -12,20 +12,6 @@
12#define MY_CLASS EFL_UI_POPUP_ALERT_CLASS 12#define MY_CLASS EFL_UI_POPUP_ALERT_CLASS
13#define MY_CLASS_NAME "Efl.Ui.Popup.Alert" 13#define MY_CLASS_NAME "Efl.Ui.Popup.Alert"
14 14
15EOLIAN static void
16_efl_ui_popup_alert_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Popup_Alert_Data *pd EINA_UNUSED)
17{
18 elm_layout_sizing_eval(efl_super(obj, MY_CLASS));
19
20 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
21 Evas_Coord minw = -1, minh = -1;
22
23 elm_coords_finger_size_adjust(1, &minw, 1, &minh);
24 edje_object_size_min_restricted_calc
25 (wd->resize_obj, &minw, &minh, minw, minh);
26 efl_gfx_size_hint_min_set(obj, EINA_SIZE2D(minw, minh));
27}
28
29static Eina_Bool 15static Eina_Bool
30_efl_ui_popup_alert_text_set(Eo *obj, Efl_Ui_Popup_Alert_Data *pd, const char *part, const char *label) 16_efl_ui_popup_alert_text_set(Eo *obj, Efl_Ui_Popup_Alert_Data *pd, const char *part, const char *label)
31{ 17{
@@ -264,7 +250,4 @@ ELM_PART_OVERRIDE_TEXT_GET(efl_ui_popup_alert, EFL_UI_POPUP_ALERT, Efl_Ui_Popup_
264 250
265/* Efl.Part end */ 251/* Efl.Part end */
266 252
267#define EFL_UI_POPUP_ALERT_EXTRA_OPS \
268 ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_popup_alert)
269
270#include "efl_ui_popup_alert.eo.c" 253#include "efl_ui_popup_alert.eo.c"
diff --git a/src/lib/elementary/efl_ui_popup_alert_scroll.c b/src/lib/elementary/efl_ui_popup_alert_scroll.c
index ac57b3d6b4..ab06d654ab 100644
--- a/src/lib/elementary/efl_ui_popup_alert_scroll.c
+++ b/src/lib/elementary/efl_ui_popup_alert_scroll.c
@@ -17,8 +17,6 @@ _scroller_sizing_eval(Eo *obj, Efl_Ui_Popup_Alert_Scroll_Data *pd, Eina_Size2D m
17{ 17{
18 Eina_Rect geom = efl_gfx_geometry_get(obj); 18 Eina_Rect geom = efl_gfx_geometry_get(obj);
19 19
20 pd->is_sizing_eval = EINA_TRUE;
21
22 if (pd->is_expandable_w && !pd->is_expandable_h) 20 if (pd->is_expandable_w && !pd->is_expandable_h)
23 { 21 {
24 if ((pd->max_scroll.w > -1) && (min.w > pd->max_scroll.w)) 22 if ((pd->max_scroll.w > -1) && (min.w > pd->max_scroll.w))
@@ -47,21 +45,26 @@ _scroller_sizing_eval(Eo *obj, Efl_Ui_Popup_Alert_Scroll_Data *pd, Eina_Size2D m
47 if (wdir && !hdir) 45 if (wdir && !hdir)
48 { 46 {
49 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_TRUE); 47 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_TRUE);
50 efl_gfx_size_set(obj, EINA_SIZE2D(pd->max_scroll.w, geom.h)); 48 efl_gfx_size_set(obj, EINA_SIZE2D(pd->max_scroll.w, min.h));
51 } 49 }
52 else if (!wdir && hdir) 50 else if (!wdir && hdir)
53 { 51 {
54 elm_scroller_content_min_limit(pd->scroller, EINA_TRUE, EINA_FALSE); 52 elm_scroller_content_min_limit(pd->scroller, EINA_TRUE, EINA_FALSE);
55 efl_gfx_size_set(obj, EINA_SIZE2D(geom.w, pd->max_scroll.h)); 53 efl_gfx_size_set(obj, EINA_SIZE2D(min.w, pd->max_scroll.h));
56 } 54 }
57 else if(wdir && hdir) 55 else if(wdir && hdir)
58 { 56 {
59 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE); 57 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
60 efl_gfx_size_set(obj, pd->max_scroll); 58 efl_gfx_size_set(obj, pd->max_scroll);
61 } 59 }
60 else
61 {
62 Eina_Size2D new_size;
63 new_size.w = min.w > geom.w ? min.w : geom.w;
64 new_size.h = min.h > geom.h ? min.h : geom.h;
65 efl_gfx_size_set(obj, new_size);
66 }
62 } 67 }
63
64 pd->is_sizing_eval = EINA_FALSE;
65} 68}
66 69
67EOLIAN static void 70EOLIAN static void
@@ -69,8 +72,6 @@ _efl_ui_popup_alert_scroll_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Popup_Alert_Sc
69{ 72{
70 if (pd->is_sizing_eval) return; 73 if (pd->is_sizing_eval) return;
71 74
72 elm_layout_sizing_eval(efl_super(obj, MY_CLASS));
73
74 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 75 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
75 Evas_Coord minw = -1, minh = -1; 76 Evas_Coord minw = -1, minh = -1;
76 77
diff --git a/src/lib/elementary/efl_ui_popup_alert_text.c b/src/lib/elementary/efl_ui_popup_alert_text.c
index 74e77833a6..232cb7fe82 100644
--- a/src/lib/elementary/efl_ui_popup_alert_text.c
+++ b/src/lib/elementary/efl_ui_popup_alert_text.c
@@ -15,15 +15,13 @@
15static void 15static void
16_scroller_sizing_eval(Eo *obj, Efl_Ui_Popup_Alert_Text_Data *pd, Eina_Size2D min) 16_scroller_sizing_eval(Eo *obj, Efl_Ui_Popup_Alert_Text_Data *pd, Eina_Size2D min)
17{ 17{
18 pd->is_sizing_eval = EINA_TRUE;
19
20 Eina_Rect geom = efl_gfx_geometry_get(obj); 18 Eina_Rect geom = efl_gfx_geometry_get(obj);
21 19
22 int cur_minw, cur_max_scroll_w; 20 int cur_minw, cur_max_scroll_w;
23 if (min.w > pd->max_minw) 21 if (min.w > pd->message_minw)
24 cur_minw = min.w; 22 cur_minw = min.w;
25 else 23 else
26 cur_minw = pd->max_minw; 24 cur_minw = pd->message_minw;
27 25
28 if (min.w > pd->max_scroll_w) 26 if (min.w > pd->max_scroll_w)
29 cur_max_scroll_w = min.w; 27 cur_max_scroll_w = min.w;
@@ -32,66 +30,159 @@ _scroller_sizing_eval(Eo *obj, Efl_Ui_Popup_Alert_Text_Data *pd, Eina_Size2D min
32 30
33 if (pd->is_expandable_w && !pd->is_expandable_h) 31 if (pd->is_expandable_w && !pd->is_expandable_h)
34 { 32 {
35 if ((pd->max_scroll_w > -1) && (cur_minw >= cur_max_scroll_w)) 33 if (pd->max_scroll_w > -1)
36 efl_gfx_size_set(efl_super(obj, MY_CLASS), EINA_SIZE2D(cur_max_scroll_w, geom.h)); 34 {
35 if (cur_minw > cur_max_scroll_w)
36 {
37 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
38 efl_gfx_size_set(obj, EINA_SIZE2D(cur_max_scroll_w, geom.h));
39 }
40 else
41 {
42 pd->is_sizing_eval = EINA_TRUE;
43 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
44 efl_gfx_size_set(obj, EINA_SIZE2D(cur_minw, geom.h));
45 pd->is_sizing_eval = EINA_FALSE;
46 }
47 }
37 else 48 else
38 efl_gfx_size_set(efl_super(obj, MY_CLASS), EINA_SIZE2D(cur_minw, geom.h)); 49 {
50 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
51 efl_gfx_size_set(obj, EINA_SIZE2D(cur_minw, geom.h));
52 }
39 } 53 }
40 else if (!pd->is_expandable_w && pd->is_expandable_h) 54 else if (!pd->is_expandable_w && pd->is_expandable_h)
41 { 55 {
42 if (pd->pre_minh != -1) 56 if (pd->max_scroll_h > -1)
43 efl_gfx_size_set(efl_super(obj, MY_CLASS), EINA_SIZE2D(geom.w, pd->max_scroll_h));
44 else if ((pd->max_scroll_h > -1) && (min.h >= pd->max_scroll_h))
45 { 57 {
46 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE); 58 if (min.h > pd->max_scroll_h)
47 efl_gfx_size_set(efl_super(obj, MY_CLASS), EINA_SIZE2D(geom.w, pd->max_scroll_h)); 59 {
48 pd->pre_minh = pd->max_scroll_h; 60 pd->is_sizing_eval = EINA_TRUE;
61 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
62 efl_gfx_size_set(obj, EINA_SIZE2D(geom.w, pd->max_scroll_h));
63 pd->is_sizing_eval = EINA_FALSE;
64 }
65 else
66 {
67 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_TRUE);
68 efl_gfx_size_set(obj, EINA_SIZE2D(geom.w, min.h));
69 }
49 } 70 }
50 else 71 else
51 { 72 {
52 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_TRUE); 73 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
53 efl_gfx_size_set(efl_super(obj, MY_CLASS), EINA_SIZE2D(geom.w, min.h)); 74 efl_gfx_size_set(obj, EINA_SIZE2D(geom.w, min.h));
54 } 75 }
55 } 76 }
56 else if (pd->is_expandable_w && pd->is_expandable_h) 77 else if (pd->is_expandable_w && pd->is_expandable_h)
57 { 78 {
58 if ((pd->max_scroll_w > -1) && (cur_minw <= cur_max_scroll_w)) 79 /*
80 Eina_Bool wdir, hdir;
81 wdir = hdir = EINA_FALSE;
82
83 ERR("[CJH] cur_max_scroll_w(%d) cur_minw(%d)", cur_max_scroll_w, cur_minw);
84 ERR("[CJH] pd->max_scroll_h(%d) min.h(%d)", pd->max_scroll_h, min.h);
85 if ((cur_max_scroll_w > -1) && (cur_minw > cur_max_scroll_w))
86 wdir = 1;
87 if ((pd->max_scroll_h > -1) && (min.h > pd->max_scroll_h))
88 hdir = 1;
89
90 if (wdir && !hdir)
59 { 91 {
60 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_TRUE); 92 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_TRUE);
61 efl_gfx_size_set(efl_super(obj, MY_CLASS), EINA_SIZE2D(cur_minw, min.h)); 93 efl_gfx_size_set(obj, EINA_SIZE2D(cur_max_scroll_w, min.h));
62 } 94 }
63 else if ((pd->max_scroll_w > -1) && (cur_minw > cur_max_scroll_w)) 95 else if (!wdir && hdir)
64 { 96 {
65 97 pd->is_sizing_eval = EINA_TRUE;
66 if (pd->pre_minh != -1) 98 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
67 efl_gfx_size_set(efl_super(obj, MY_CLASS), EINA_SIZE2D(cur_max_scroll_w, pd->max_scroll_h)); 99 efl_gfx_size_set(obj, EINA_SIZE2D(cur_minw, pd->max_scroll_h));
68 else if (min.h >= pd->max_scroll_h) 100 pd->is_sizing_eval = EINA_FALSE;
69 {
70 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
71 efl_gfx_size_set(efl_super(obj, MY_CLASS), EINA_SIZE2D(cur_max_scroll_w, pd->max_scroll_h));
72 pd->pre_minh = pd->max_scroll_h;
73 }
74 else
75 {
76 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_TRUE);
77 efl_gfx_size_set(efl_super(obj, MY_CLASS), EINA_SIZE2D(cur_max_scroll_w, min.h));
78 }
79 } 101 }
80 else 102 else if (wdir && hdir)
81 { 103 {
82 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_TRUE); 104 pd->is_sizing_eval = EINA_TRUE;
83 efl_gfx_size_set(efl_super(obj, MY_CLASS), EINA_SIZE2D(cur_minw, min.h)); 105 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
106 efl_gfx_size_set(obj, EINA_SIZE2D(cur_max_scroll_w, pd->max_scroll_h));
107 pd->is_sizing_eval = EINA_FALSE;
84 } 108 }
85 } 109 */
110 Eina_Bool wdir, hdir;
111 wdir = hdir = EINA_FALSE;
86 112
87 pd->is_sizing_eval = EINA_FALSE; 113 if (cur_minw > cur_max_scroll_w)
88} 114 wdir = EINA_TRUE;
115 if (min.h > pd->max_scroll_h)
116 hdir = EINA_TRUE;
89 117
90static void 118 if (cur_max_scroll_w <= -1)
91_efl_ui_popup_alert_text_efl_gfx_size_set(Eo *obj, Efl_Ui_Popup_Alert_Text_Data *pd, Eina_Size2D size) 119 {
92{ 120 // -1 !-1
93 evas_object_resize(pd->message, size.w, size.h); 121 if (pd->max_scroll_h > -1)
94 efl_gfx_size_set(efl_super(obj, MY_CLASS), size); 122 {
123 if (hdir)
124 {
125 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
126 efl_gfx_size_set(obj, EINA_SIZE2D(cur_minw, pd->max_scroll_h));
127 }
128 else
129 {
130 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
131 efl_gfx_size_set(obj, EINA_SIZE2D(cur_minw, min.h));
132 }
133 }
134 // -1 -1
135 else
136 {
137 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
138 efl_gfx_size_set(obj, EINA_SIZE2D(cur_minw, min.h));
139 }
140 }
141 else if (pd->max_scroll_h <= -1)
142 {
143 // !-1 -1
144 if (wdir)
145 {
146 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
147 efl_gfx_size_set(obj, EINA_SIZE2D(cur_max_scroll_w, min.h));
148 }
149 else
150 {
151 pd->is_sizing_eval = EINA_TRUE;
152 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_TRUE);
153 efl_gfx_size_set(obj, EINA_SIZE2D(cur_minw, min.h));
154 pd->is_sizing_eval = EINA_FALSE;
155 }
156 }
157 else if ((cur_max_scroll_w > -1) && (pd->max_scroll_h > -1))
158 {
159 // !-1 !-1
160 if (wdir && hdir)
161 {
162 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
163 efl_gfx_size_set(obj, EINA_SIZE2D(cur_max_scroll_w, pd->max_scroll_h));
164 }
165 else if (wdir && !hdir)
166 {
167 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
168 efl_gfx_size_set(obj, EINA_SIZE2D(cur_max_scroll_w, min.h));
169 }
170 else if (!wdir && hdir)
171 {
172 pd->is_sizing_eval = EINA_TRUE;
173 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
174 efl_gfx_size_set(obj, EINA_SIZE2D(cur_minw, pd->max_scroll_h));
175 pd->is_sizing_eval = EINA_FALSE;
176 }
177 else
178 {
179 pd->is_sizing_eval = EINA_TRUE;
180 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_TRUE);
181 efl_gfx_size_set(obj, EINA_SIZE2D(cur_minw, min.h));
182 pd->is_sizing_eval = EINA_FALSE;
183 }
184 }
185 }
95} 186}
96 187
97EOLIAN static void 188EOLIAN static void
@@ -101,10 +192,10 @@ _efl_ui_popup_alert_text_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Popup_Alert_Text
101 192
102 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 193 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
103 Evas_Coord minw = -1, minh = -1; 194 Evas_Coord minw = -1, minh = -1;
104
105 elm_coords_finger_size_adjust(1, &minw, 1, &minh); 195 elm_coords_finger_size_adjust(1, &minw, 1, &minh);
106 edje_object_size_min_restricted_calc(wd->resize_obj, &minw, &minh, minw, minh); 196 edje_object_size_min_restricted_calc(wd->resize_obj, &minw, &minh, minw, minh);
107 efl_gfx_size_hint_min_set(obj, EINA_SIZE2D(minw, minh)); 197 efl_gfx_size_hint_min_set(obj, EINA_SIZE2D(minw, minh));
198 ERR("[CJH] minw(%d) minh(%d)", minw, minh);
108 199
109 _scroller_sizing_eval(obj, pd, EINA_SIZE2D(minw, minh)); 200 _scroller_sizing_eval(obj, pd, EINA_SIZE2D(minw, minh));
110} 201}
@@ -140,12 +231,12 @@ _efl_ui_popup_alert_text_text_set(Eo *obj, Efl_Ui_Popup_Alert_Text_Data *pd, con
140 efl_content_set(efl_part(pd->scroller, "default"), pd->message); 231 efl_content_set(efl_part(pd->scroller, "default"), pd->message);
141 } 232 }
142 233
143 pd->max_minw = -1; 234 pd->message_minw = -1;
144 pd->pre_minh = -1; 235 pd->pre_minh = -1;
145 elm_object_text_set(pd->message, label); 236 elm_object_text_set(pd->message, label);
146 elm_label_line_wrap_set(pd->message, ELM_WRAP_NONE); 237 elm_label_line_wrap_set(pd->message, ELM_WRAP_NONE);
147 Eina_Size2D message_size = efl_gfx_size_hint_combined_min_get(pd->message); 238 Eina_Size2D message_size = efl_gfx_size_hint_combined_min_get(pd->message);
148 pd->max_minw = message_size.w; 239 pd->message_minw = message_size.w;
149 elm_label_line_wrap_set(pd->message, ELM_WRAP_MIXED); 240 elm_label_line_wrap_set(pd->message, ELM_WRAP_MIXED);
150 241
151 elm_layout_sizing_eval(obj); 242 elm_layout_sizing_eval(obj);
@@ -192,10 +283,10 @@ _efl_ui_popup_alert_text_expandable_set(Eo *obj EINA_UNUSED, Efl_Ui_Popup_Alert_
192 if (pd->message) 283 if (pd->message)
193 { 284 {
194 pd->pre_minh = -1; 285 pd->pre_minh = -1;
195 pd->max_minw = -1; 286 pd->message_minw = -1;
196 elm_label_line_wrap_set(pd->message, ELM_WRAP_NONE); 287 elm_label_line_wrap_set(pd->message, ELM_WRAP_NONE);
197 Eina_Size2D message_size = efl_gfx_size_hint_combined_min_get(pd->message); 288 Eina_Size2D message_size = efl_gfx_size_hint_combined_min_get(pd->message);
198 pd->max_minw = message_size.w; 289 pd->message_minw = message_size.w;
199 elm_label_line_wrap_set(pd->message, ELM_WRAP_MIXED); 290 elm_label_line_wrap_set(pd->message, ELM_WRAP_MIXED);
200 } 291 }
201 292
@@ -230,7 +321,7 @@ _efl_ui_popup_alert_text_efl_object_constructor(Eo *obj,
230 efl_content_set(efl_part(efl_super(obj, MY_CLASS), "elm.swallow.content"), 321 efl_content_set(efl_part(efl_super(obj, MY_CLASS), "elm.swallow.content"),
231 pd->scroller); 322 pd->scroller);
232 323
233 pd->max_minw = -1; 324 pd->message_minw = -1;
234 pd->pre_minh = -1; 325 pd->pre_minh = -1;
235 pd->max_scroll_w = -1; 326 pd->max_scroll_w = -1;
236 pd->max_scroll_h = -1; 327 pd->max_scroll_h = -1;
diff --git a/src/lib/elementary/efl_ui_popup_alert_text.eo b/src/lib/elementary/efl_ui_popup_alert_text.eo
index 6cffd05bd7..b455f0ce2c 100644
--- a/src/lib/elementary/efl_ui_popup_alert_text.eo
+++ b/src/lib/elementary/efl_ui_popup_alert_text.eo
@@ -19,7 +19,6 @@ class Efl.Ui.Popup.Alert.Text(Efl.Ui.Popup.Alert, Efl.Text)
19 implements { 19 implements {
20 Efl.Object.constructor; 20 Efl.Object.constructor;
21 Efl.Gfx.Size.Hint.hint_max { set;} 21 Efl.Gfx.Size.Hint.hint_max { set;}
22 Efl.Gfx.size { set;}
23 Efl.Text.text { get; set; } 22 Efl.Text.text { get; set; }
24 Efl.Part.part; 23 Efl.Part.part;
25 } 24 }
diff --git a/src/lib/elementary/efl_ui_popup_alert_text_private.h b/src/lib/elementary/efl_ui_popup_alert_text_private.h
index 5a8bdcb768..1a5746dd9c 100644
--- a/src/lib/elementary/efl_ui_popup_alert_text_private.h
+++ b/src/lib/elementary/efl_ui_popup_alert_text_private.h
@@ -8,10 +8,12 @@ struct _Efl_Ui_Popup_Alert_Text_Data
8{ 8{
9 Eo *scroller; 9 Eo *scroller;
10 Eo *message; 10 Eo *message;
11 Evas_Coord max_minw; 11 Evas_Coord message_minw;
12 Evas_Coord pre_minh; 12 Evas_Coord pre_minh;
13 Evas_Coord max_scroll_w; 13 Evas_Coord max_scroll_w;
14 Evas_Coord max_scroll_h; 14 Evas_Coord max_scroll_h;
15 Eina_Size2D prev_geom;
16 Eina_Size2D prev_min;
15 Eina_Bool is_expandable_w : 1; 17 Eina_Bool is_expandable_w : 1;
16 Eina_Bool is_expandable_h : 1; 18 Eina_Bool is_expandable_h : 1;
17 Eina_Bool is_sizing_eval: 1; 19 Eina_Bool is_sizing_eval: 1;