NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

layout: apply widget's states when elm_layout_file_set is called 

when a layout's theme is changed by elm_layout_theme_set, the edje is updated
according to the widget's states such as 'disabled' or 'highlight_in_theme'.
but the update is dropped for elm_layout_file_set.
this patch tied up the codes into _visuals_refresh function
so that the same update happens for elm_layout_file_set.

@fix
This commit is contained in:
Jaeun Choi 2015-02-27 14:15:42 +09:00
parent 244f32b797
commit 7f77edf55d
1 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
legacy/elementary/src/lib/elm_layout.c
View File

@ -273,36 +273,6 @@ _parts_cursors_apply(Elm_Layout_Smart_Data *sd)
}
}
static void
_visuals_refresh(Evas_Object *obj,
Elm_Layout_Smart_Data *sd)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
_parts_swallow_fix(sd, wd);
_parts_text_fix(sd);
_parts_signals_emit(sd);
_parts_cursors_apply(sd);
eo_do(obj, elm_obj_layout_sizing_eval());
}
EOLIAN static Eina_Bool
_elm_layout_elm_widget_disable(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
if (elm_object_disabled_get(obj))
edje_object_signal_emit
(wd->resize_obj, "elm,state,disabled", "elm");
else
edje_object_signal_emit
(wd->resize_obj, "elm,state,enabled", "elm");
return EINA_TRUE;
}
static void
_elm_layout_highlight_in_theme(Evas_Object *obj)
{
@ -325,6 +295,50 @@ _elm_layout_highlight_in_theme(Evas_Object *obj)
elm_widget_access_highlight_in_theme_set(obj, EINA_FALSE);
}
static Eina_Bool
_visuals_refresh(Evas_Object *obj,
Elm_Layout_Smart_Data *sd)
{
Eina_Bool ret = EINA_FALSE;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
_parts_swallow_fix(sd, wd);
_parts_text_fix(sd);
_parts_signals_emit(sd);
_parts_cursors_apply(sd);
edje_object_mirrored_set
(wd->resize_obj, elm_widget_mirrored_get(obj));
edje_object_scale_set
(wd->resize_obj,
elm_widget_scale_get(obj) * elm_config_scale_get());
_elm_layout_highlight_in_theme(obj);
eo_do(obj, ret = elm_obj_widget_disable());
eo_do(obj, elm_obj_layout_sizing_eval());
return ret;
}
EOLIAN static Eina_Bool
_elm_layout_elm_widget_disable(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
if (elm_object_disabled_get(obj))
edje_object_signal_emit
(wd->resize_obj, "elm,state,disabled", "elm");
else
edje_object_signal_emit
(wd->resize_obj, "elm,state,enabled", "elm");
return EINA_TRUE;
}
static Eina_Bool
_elm_layout_theme_internal(Eo *obj, Elm_Layout_Smart_Data *sd)
{
@ -337,21 +351,10 @@ _elm_layout_theme_internal(Eo *obj, Elm_Layout_Smart_Data *sd)
elm_widget_style_get(obj)))
return EINA_FALSE;
edje_object_mirrored_set
(wd->resize_obj, elm_widget_mirrored_get(obj));
edje_object_scale_set
(wd->resize_obj,
elm_widget_scale_get(obj) * elm_config_scale_get());
_elm_layout_highlight_in_theme(obj);
ret = _visuals_refresh(obj, sd);
evas_object_smart_callback_call(obj, SIG_THEME_CHANGED, NULL);
_visuals_refresh(obj, sd);
eo_do(obj, ret = elm_obj_widget_disable());
return ret;
}