summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHermet Park <hermet@hermet.pe.kr>2016-04-12 00:36:12 +0900
committerHermet Park <hermet@hermet.pe.kr>2016-04-12 00:36:12 +0900
commit5f9e73b96601d225d3d1d1bc842e4fc18b2a0822 (patch)
treec524687d4249cdc09012ce9927c17d55e4afc9dc
parent33d9bcc55123343489037aa868ed5a3cd05e9438 (diff)
elementary/scroller: code refactoring.
try to update scroller size when popup layout is updated.
-rw-r--r--src/lib/elementary/elc_popup.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index c43d22e295..88b81673ed 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -197,7 +197,6 @@ _notify_resize_cb(void *data,
197 197
198 ELM_POPUP_CHECK(popup); 198 ELM_POPUP_CHECK(popup);
199 199
200 _scroller_size_calc(popup);
201 elm_layout_sizing_eval(popup); 200 elm_layout_sizing_eval(popup);
202} 201}
203 202
@@ -419,7 +418,6 @@ _elm_popup_elm_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd)
419 elm_layout_signal_emit(sd->content_area, "elm,scroll,enable", "elm"); 418 elm_layout_signal_emit(sd->content_area, "elm,scroll,enable", "elm");
420 419
421 _visuals_set(obj); 420 _visuals_set(obj);
422 _scroller_size_calc(obj);
423 elm_layout_sizing_eval(obj); 421 elm_layout_sizing_eval(obj);
424 422
425 /* access */ 423 /* access */
@@ -448,6 +446,8 @@ _elm_popup_elm_layout_sizing_eval(Eo *obj, Elm_Popup_Data *sd)
448 Evas_Coord h_box = 0, minh_box = 0; 446 Evas_Coord h_box = 0, minh_box = 0;
449 Evas_Coord minw = -1, minh = -1; 447 Evas_Coord minw = -1, minh = -1;
450 448
449 _scroller_size_calc(obj);
450
451 if (sd->items) 451 if (sd->items)
452 { 452 {
453 EINA_LIST_FOREACH(sd->items, elist, it) 453 EINA_LIST_FOREACH(sd->items, elist, it)
@@ -1064,7 +1064,6 @@ _elm_popup_elm_layout_text_set(Eo *obj, Elm_Popup_Data *_pd, const char *part, c
1064 else 1064 else
1065 int_ret = elm_layout_text_set(_pd->main_layout, part, label); 1065 int_ret = elm_layout_text_set(_pd->main_layout, part, label);
1066 1066
1067 _scroller_size_calc(obj);
1068 elm_layout_sizing_eval(obj); 1067 elm_layout_sizing_eval(obj);
1069 1068
1070 return int_ret; 1069 return int_ret;
@@ -1246,7 +1245,6 @@ _elm_popup_elm_container_content_set(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, c
1246 else 1245 else
1247 ret = elm_obj_container_content_set(_pd->main_layout, part, content); 1246 ret = elm_obj_container_content_set(_pd->main_layout, part, content);
1248 1247
1249 _scroller_size_calc(obj);
1250 elm_layout_sizing_eval(obj); 1248 elm_layout_sizing_eval(obj);
1251 1249
1252 return ret; 1250 return ret;
@@ -1804,7 +1802,6 @@ _elm_popup_item_append(Eo *obj, Elm_Popup_Data *sd, const char *label, Evas_Obje
1804 elm_box_pack_end(sd->box, VIEW(it)); 1802 elm_box_pack_end(sd->box, VIEW(it));
1805 sd->items = eina_list_append(sd->items, it); 1803 sd->items = eina_list_append(sd->items, it);
1806 1804
1807 _scroller_size_calc(obj);
1808 elm_layout_sizing_eval(obj); 1805 elm_layout_sizing_eval(obj);
1809 1806
1810 return eo_it; 1807 return eo_it;
@@ -1840,7 +1837,6 @@ _elm_popup_scrollable_set(Eo *obj, Elm_Popup_Data *pd, Eina_Bool scroll)
1840 elm_layout_signal_emit(pd->content_area, "elm,scroll,enable", "elm"); 1837 elm_layout_signal_emit(pd->content_area, "elm,scroll,enable", "elm");
1841 } 1838 }
1842 1839
1843 _scroller_size_calc(obj);
1844 elm_layout_sizing_eval(obj); 1840 elm_layout_sizing_eval(obj);
1845} 1841}
1846 1842