summaryrefslogtreecommitdiff
path: root/src/lib/elementary/efl_ui_win.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-08-09 16:13:06 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-08-09 17:08:24 +0900
commitdee61f40973071bab093f2f81109a7f2d5ff4097 (patch)
treedca04a67936902fbaadd4e3add4abeb928d1cc3a /src/lib/elementary/efl_ui_win.c
parentf60c2083a463d6e134b6fb34b5d640fe36c25ad9 (diff)
elm: Cleanup theme and style set functions
This makes efl_ui_layout_theme_set() return a Theme_Apply error code. The type is now public as Efl.Ui.Theme.Apply. Ref T5329 Ref T5363
Diffstat (limited to '')
-rw-r--r--src/lib/elementary/efl_ui_win.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 2019f78e9d..96f27cc535 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -346,7 +346,7 @@ _elm_win_on_resize_obj_changed_size_hints(void *data,
346 void *event_info); 346 void *event_info);
347static void 347static void
348_elm_win_img_callbacks_del(Evas_Object *obj, Evas_Object *imgobj); 348_elm_win_img_callbacks_del(Evas_Object *obj, Evas_Object *imgobj);
349static Elm_Theme_Apply _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd); 349static Efl_Ui_Theme_Apply _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd);
350static void _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style); 350static void _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style);
351static void _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool calc); 351static void _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool calc);
352static inline void _elm_win_need_frame_adjust(Efl_Ui_Win_Data *sd, const char *engine); 352static inline void _elm_win_need_frame_adjust(Efl_Ui_Win_Data *sd, const char *engine);
@@ -6286,16 +6286,16 @@ _efl_ui_win_focus_highlight_enabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd
6286 return sd->focus_highlight.enabled; 6286 return sd->focus_highlight.enabled;
6287} 6287}
6288 6288
6289static Elm_Theme_Apply 6289static Efl_Ui_Theme_Apply
6290_elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd) 6290_elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
6291{ 6291{
6292 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 6292 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
6293 Eina_Bool ret = EINA_FALSE, prev_alpha; 6293 Eina_Bool ret = EINA_FALSE, prev_alpha;
6294 const char *s; 6294 const char *s;
6295 6295
6296 int_ret = _elm_theme_object_set(obj, sd->legacy.edje, "win", "base", 6296 int_ret = _elm_theme_object_set(obj, sd->legacy.edje, "win", "base",
6297 elm_widget_style_get(obj)); 6297 elm_widget_style_get(obj));
6298 if (!int_ret) return ELM_THEME_APPLY_FAILED; 6298 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
6299 6299
6300 edje_object_mirrored_set(sd->legacy.edje, efl_ui_mirrored_get(obj)); 6300 edje_object_mirrored_set(sd->legacy.edje, efl_ui_mirrored_get(obj));
6301 edje_object_scale_set(sd->legacy.edje, 6301 edje_object_scale_set(sd->legacy.edje,
@@ -6304,7 +6304,7 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
6304 efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_THEME_CHANGED, NULL); 6304 efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_THEME_CHANGED, NULL);
6305 ret = elm_obj_widget_disable(obj); 6305 ret = elm_obj_widget_disable(obj);
6306 6306
6307 if (!ret) int_ret = ELM_THEME_APPLY_FAILED; 6307 if (!ret) int_ret = EFL_UI_THEME_APPLY_FAILED;
6308 6308
6309 prev_alpha = sd->theme_alpha; 6309 prev_alpha = sd->theme_alpha;
6310 s = edje_object_data_get(sd->legacy.edje, "alpha"); 6310 s = edje_object_data_get(sd->legacy.edje, "alpha");
@@ -6315,17 +6315,17 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
6315 return int_ret; 6315 return int_ret;
6316} 6316}
6317 6317
6318EOLIAN static Elm_Theme_Apply 6318EOLIAN static Efl_Ui_Theme_Apply
6319_efl_ui_win_elm_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd) 6319_efl_ui_win_elm_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd)
6320{ 6320{
6321 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 6321 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
6322 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 6322 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
6323 if (!int_ret) return ELM_THEME_APPLY_FAILED; 6323 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
6324 6324
6325 sd->focus_highlight.theme_changed = EINA_TRUE; 6325 sd->focus_highlight.theme_changed = EINA_TRUE;
6326 6326
6327 int_ret = _elm_win_theme_internal(obj, sd) & int_ret; 6327 int_ret = _elm_win_theme_internal(obj, sd) & int_ret;
6328 if (!int_ret) return ELM_THEME_APPLY_FAILED; 6328 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
6329 _elm_win_focus_highlight_reconfigure_job_start(sd); 6329 _elm_win_focus_highlight_reconfigure_job_start(sd);
6330 6330
6331 return int_ret; 6331 return int_ret;