enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

elementary/popup - fix popup to not unswallow invalid contents when the contents are deleted. 

SVN revision: 83950
This commit is contained in:
ChunEon Park 2013-02-15 12:55:43 +00:00
parent 55d595b44e
commit 978cda4022
3 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
legacy/elementary/ChangeLog
View File

@ -1017,3 +1017,11 @@
2013-02-15 Shinwoo Kim
* Popup is now a focusable object.
2013-02-15 ChunEon Park (Hermet)
* support naviframe, button, label orientation mode.
2013-02-15 ChunEon Park (Hermet)
* Fix popup to not unswallow invalid contents when contents are deleted.

3
legacy/elementary/NEWS
View File

@ -38,7 +38,7 @@ Additions:
* Add APIs - elm_object_domain_translatable_part_text_set(), elm_object_translatable_part_text_get().
* Add APIs - elm_object_orientation_mode_disabled_set(), elm_object_orientation_mode_disabled_get().
* Add the reorder effect in toolbar.
* Support naviframe, label, button orientation mode.
Improvements:
@ -148,6 +148,7 @@ Fixes:
* Fix a elm_transit crash issue when user delete all target objects in the effect end callback.
* Fix elc_player pause state to be in sync
* Fix time string display to handle hours right
* Fix popup to not unswallow invalid contents when contents are deleted.
Removals:

24
legacy/elementary/src/lib/elc_popup.c
View File

@ -388,8 +388,6 @@ _on_content_del(void *data,
ELM_POPUP_DATA_GET(data, sd);
sd->content = NULL;
edje_object_part_unswallow
(data, edje_object_part_swallow_get(data, "elm.swallow.content"));
elm_layout_sizing_eval(data);
}
@ -402,8 +400,6 @@ _on_text_content_del(void *data,
ELM_POPUP_DATA_GET(data, sd);
sd->text_content_obj = NULL;
edje_object_part_unswallow
(data, edje_object_part_swallow_get(data, "elm.swallow.content"));
elm_layout_sizing_eval(data);
}
@ -877,7 +873,7 @@ static Eina_Bool
_content_text_set(Evas_Object *obj,
const char *text)
{
Evas_Object *prev_content, *ao;
Evas_Object *ao;
char buf[128];
ELM_POPUP_DATA_GET(obj, sd);
@ -888,18 +884,10 @@ _content_text_set(Evas_Object *obj,
_items_remove(sd);
_list_del(sd);
}
prev_content = elm_layout_content_get
(sd->content_area, "elm.swallow.content");
if (prev_content)
evas_object_del(prev_content);
else edje_object_part_swallow(wd->resize_obj, "elm.swallow.content",
sd->content_area);
if (!text) goto end;
edje_object_part_swallow
(wd->resize_obj, "elm.swallow.content",
sd->content_area);
sd->text_content_obj = elm_label_add(obj);
evas_object_event_callback_add
@ -1026,8 +1014,6 @@ static Eina_Bool
_content_set(Evas_Object *obj,
Evas_Object *content)
{
Evas_Object *prev_content;
ELM_POPUP_DATA_GET(obj, sd);
Elm_Widget_Smart_Data *wd = eo_data_get(obj, ELM_OBJ_WIDGET_CLASS);
@ -1037,10 +1023,6 @@ _content_set(Evas_Object *obj,
_items_remove(sd);
_list_del(sd);
}
prev_content =
elm_layout_content_get(sd->content_area, "elm.swallow.content");
if (prev_content)
evas_object_del(prev_content);
sd->content = content;
if (content)