eunue pushed a commit to branch elementary-1.13.
http://git.enlightenment.org/core/elementary.git/commit/?id=62cc830c0768928b23bacf3b77d8b2ab74f951c5
commit 62cc830c0768928b23bacf3b77d8b2ab74f951c5
Author: Jaeun Choi <jaeun12.c...@samsung.com>
Date: Tue Feb 10 16:01:23 2015 +0900
popup: passing right parameter to elm_layout_sizing_eval
pass popup object instead of main_layout to elm_layout_sizing_eval()
so that _elm_popup_elm_layout_sizing_eval is called
@fix
---
src/lib/elc_popup.c | 27 ++++++++++-----------------
1 file changed, 10 insertions(+), 17 deletions(-)
diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index 48ed800..82da275 100644
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -362,8 +362,7 @@ _elm_popup_elm_widget_theme_apply(Eo *obj, Elm_Popup_Data
*sd)
elm_layout_signal_emit(sd->main_layout, "elm,state,title,icon,visible",
"elm");
_visuals_set(obj);
- edje_object_message_signal_process(elm_layout_edje_get(sd->main_layout));
- elm_layout_sizing_eval(sd->main_layout);
+ elm_layout_sizing_eval(obj);
/* access */
if (_elm_config->access_mode) _access_obj_process(obj, EINA_TRUE);
@@ -425,7 +424,6 @@ _elm_popup_elm_widget_sub_object_del(Eo *obj,
Elm_Popup_Data *sd, Evas_Object *s
if (sobj == sd->title_icon)
{
elm_layout_signal_emit(sd->main_layout, "elm,state,title,icon,hidden",
"elm");
-
edje_object_message_signal_process(elm_layout_edje_get(sd->main_layout));
sd->title_icon = NULL;
}
else if ((it =
@@ -452,7 +450,7 @@ _on_content_del(void *data,
ELM_POPUP_DATA_GET(data, sd);
sd->content = NULL;
- elm_layout_sizing_eval(sd->main_layout);
+ elm_layout_sizing_eval(data);
}
static void
@@ -464,7 +462,7 @@ _on_text_content_del(void *data,
ELM_POPUP_DATA_GET(data, sd);
sd->text_content_obj = NULL;
- elm_layout_sizing_eval(sd->main_layout);
+ elm_layout_sizing_eval(data);
}
static void
@@ -479,7 +477,7 @@ _on_table_del(void *data,
sd->spacer = NULL;
sd->scr = NULL;
sd->box = NULL;
- elm_layout_sizing_eval(sd->main_layout);
+ elm_layout_sizing_eval(data);
}
static void
@@ -544,7 +542,6 @@ _button_remove(Evas_Object *obj,
{
_visuals_set(obj);
ELM_SAFE_FREE(sd->action_area, evas_object_del);
-
edje_object_message_signal_process(elm_layout_edje_get(sd->main_layout));
}
else
{
@@ -883,8 +880,7 @@ _title_text_set(Evas_Object *obj,
if (title_visibility_old != title_visibility_current)
_visuals_set(obj);
- edje_object_message_signal_process(elm_layout_edje_get(sd->main_layout));
- elm_layout_sizing_eval(sd->main_layout);
+ elm_layout_sizing_eval(obj);
return EINA_TRUE;
}
@@ -940,7 +936,7 @@ _content_text_set(Evas_Object *obj,
}
end:
- elm_layout_sizing_eval(sd->main_layout);
+ elm_layout_sizing_eval(obj);
return EINA_TRUE;
}
@@ -1014,8 +1010,7 @@ _title_icon_set(Evas_Object *obj,
elm_layout_signal_emit(sd->main_layout, "elm,state,title,icon,visible",
"elm");
if (title_visibility_old != title_visibility_current) _visuals_set(obj);
- edje_object_message_signal_process(elm_layout_edje_get(sd->main_layout));
- elm_layout_sizing_eval(sd->main_layout);
+ elm_layout_sizing_eval(obj);
return EINA_TRUE;
}
@@ -1046,7 +1041,7 @@ _content_set(Evas_Object *obj,
evas_object_event_callback_add
(content, EVAS_CALLBACK_DEL, _on_content_del, obj);
}
- elm_layout_sizing_eval(sd->main_layout);
+ elm_layout_sizing_eval(obj);
return EINA_TRUE;
}
@@ -1111,10 +1106,9 @@ _action_button_set(Evas_Object *obj,
elm_object_part_content_set
(sd->action_area, buf, sd->buttons[idx]->btn);
- edje_object_message_signal_process(elm_layout_edje_get(sd->main_layout));
if (sd->items) _scroller_size_calc(obj);
- elm_layout_sizing_eval(sd->main_layout);
+ elm_layout_sizing_eval(obj);
}
EOLIAN static Eina_Bool
@@ -1218,7 +1212,7 @@ _content_unset(Evas_Object *obj)
content = eo_do(sd->content_area,
elm_obj_container_content_unset(CONTENT_PART));
sd->content = NULL;
- elm_layout_sizing_eval(sd->main_layout);
+ elm_layout_sizing_eval(obj);
return content;
}
@@ -1441,7 +1435,6 @@ _elm_popup_evas_object_smart_add(Eo *obj, Elm_Popup_Data
*priv)
elm_widget_can_focus_set(priv->main_layout, EINA_TRUE);
_visuals_set(obj);
- edje_object_message_signal_process(elm_layout_edje_get(priv->main_layout));
}
static void
--
