enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

[access][popup] fix elm_object_style_set(); issue: it removes previous part object

This commit is contained in:
Shinwoo Kim 2013-02-27 21:03:13 +09:00
parent 8e6ff77250
commit 8f57043b25
1 changed files with 49 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,6 +225,52 @@ _mirrored_set(Evas_Object *obj,
edje_object_mirrored_set(VIEW(item), rtl);
}
static void
_access_obj_process(Eo *obj, Eina_Bool is_access)
{
Evas_Object *ao;
ELM_POPUP_DATA_GET(obj, sd);
Elm_Widget_Smart_Data *wd = eo_data_get(obj, ELM_OBJ_WIDGET_CLASS);
if (is_access)
{
if (sd->title_text)
{
ao = _elm_access_edje_object_part_object_register
(obj, wd->resize_obj, ACCESS_TITLE_PART);
_elm_access_text_set(_elm_access_object_get(ao),
ELM_ACCESS_TYPE, E_("Popup Title"));
_elm_access_text_set(_elm_access_object_get(ao),
ELM_ACCESS_INFO, sd->title_text);
}
if (sd->text_content_obj)
{
ao = _elm_access_edje_object_part_object_register
(obj, wd->resize_obj, ACCESS_BODY_PART);
_elm_access_text_set(_elm_access_object_get(ao),
ELM_ACCESS_TYPE, E_("Popup Body Text"));
_elm_access_text_set(_elm_access_object_get(ao),
ELM_ACCESS_INFO, elm_object_text_get(sd->text_content_obj));
}
}
else
{
if (sd->title_text)
{
_elm_access_edje_object_part_object_unregister
(obj, wd->resize_obj, ACCESS_TITLE_PART);
}
if (sd->text_content_obj)
{
_elm_access_edje_object_part_object_unregister
(obj, wd->resize_obj, ACCESS_BODY_PART);
}
}
}
static void
_elm_popup_smart_theme(Eo *obj, void *_pd, va_list *list)
{
@ -301,6 +347,9 @@ _elm_popup_smart_theme(Eo *obj, void *_pd, va_list *list)
edje_object_message_signal_process(wd->resize_obj);
elm_layout_sizing_eval(obj);
/* access */
if (_elm_config->access_mode) _access_obj_process(obj, EINA_TRUE);
if (ret) *ret = EINA_TRUE;
}
@ -783,48 +832,6 @@ _item_new(Elm_Popup_Item *item)
evas_object_show(VIEW(item));
}
static void
_access_obj_process(Eo *obj, Eina_Bool is_access)
{
Evas_Object *ao;
ELM_POPUP_DATA_GET(obj, sd);
Elm_Widget_Smart_Data *wd = eo_data_get(obj, ELM_OBJ_WIDGET_CLASS);
if (is_access)
{
if (sd->title_text)
{
ao = _elm_access_edje_object_part_object_register
(obj, wd->resize_obj, ACCESS_TITLE_PART);
_elm_access_text_set(_elm_access_object_get(ao),
ELM_ACCESS_TYPE, E_("Popup Title"));
}
if (sd->text_content_obj)
{
ao = _elm_access_edje_object_part_object_register
(obj, wd->resize_obj, ACCESS_BODY_PART);
_elm_access_text_set(_elm_access_object_get(ao),
ELM_ACCESS_TYPE, E_("Popup Body Text"));
}
}
else
{
if (sd->title_text)
{
_elm_access_edje_object_part_object_unregister
(obj, wd->resize_obj, ACCESS_TITLE_PART);
}
if (sd->text_content_obj)
{
_elm_access_edje_object_part_object_unregister
(obj, wd->resize_obj, ACCESS_BODY_PART);
}
}
}
static Eina_Bool
_title_text_set(Evas_Object *obj,
const char *text)