From dee61f40973071bab093f2f81109a7f2d5ff4097 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Wed, 9 Aug 2017 16:13:06 +0900 Subject: [PATCH] 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 --- src/lib/elementary/efl_ui_button.c | 6 +-- src/lib/elementary/efl_ui_check.c | 8 ++-- src/lib/elementary/efl_ui_clock.c | 6 +-- src/lib/elementary/efl_ui_flip.c | 6 +-- src/lib/elementary/efl_ui_grid.c | 6 +-- src/lib/elementary/efl_ui_image.c | 6 +-- src/lib/elementary/efl_ui_image_zoomable.c | 6 +-- src/lib/elementary/efl_ui_layout.c | 30 +++++++----- src/lib/elementary/efl_ui_layout.eo | 20 +++++--- src/lib/elementary/efl_ui_nstate.c | 6 +-- src/lib/elementary/efl_ui_panes.c | 6 +-- src/lib/elementary/efl_ui_progressbar.c | 8 ++-- src/lib/elementary/efl_ui_radio.c | 8 ++-- src/lib/elementary/efl_ui_slider.c | 8 ++-- src/lib/elementary/efl_ui_text.c | 8 ++-- src/lib/elementary/efl_ui_win.c | 18 +++---- src/lib/elementary/elc_combobox.c | 8 ++-- src/lib/elementary/elc_ctxpopup.c | 6 +-- src/lib/elementary/elc_fileselector.c | 6 +-- src/lib/elementary/elc_fileselector_button.c | 8 ++-- src/lib/elementary/elc_fileselector_entry.c | 8 ++-- src/lib/elementary/elc_hoversel.c | 8 ++-- src/lib/elementary/elc_multibuttonentry.c | 6 +-- src/lib/elementary/elc_naviframe.c | 4 +- src/lib/elementary/elc_player.c | 6 +-- src/lib/elementary/elc_popup.c | 4 +- src/lib/elementary/elm_actionslider.c | 8 ++-- src/lib/elementary/elm_box.c | 8 ++-- src/lib/elementary/elm_calendar.c | 6 +-- src/lib/elementary/elm_clock.c | 6 +-- src/lib/elementary/elm_colorselector.c | 8 ++-- src/lib/elementary/elm_conform.c | 6 +-- src/lib/elementary/elm_dayselector.c | 6 +-- src/lib/elementary/elm_diskselector.c | 6 +-- src/lib/elementary/elm_entry.c | 10 ++-- src/lib/elementary/elm_flipselector.c | 8 ++-- src/lib/elementary/elm_general.eot | 14 ++++++ src/lib/elementary/elm_gengrid.c | 10 ++-- src/lib/elementary/elm_genlist.c | 10 ++-- src/lib/elementary/elm_grid.c | 6 +-- src/lib/elementary/elm_hover.c | 6 +-- src/lib/elementary/elm_icon.c | 6 +-- src/lib/elementary/elm_index.c | 6 +-- src/lib/elementary/elm_label.c | 8 ++-- src/lib/elementary/elm_layout_legacy.h | 17 +++++++ src/lib/elementary/elm_list.c | 6 +-- src/lib/elementary/elm_map.c | 8 ++-- src/lib/elementary/elm_mapbuf.c | 6 +-- src/lib/elementary/elm_menu.c | 6 +-- src/lib/elementary/elm_notify.c | 8 ++-- src/lib/elementary/elm_panel.c | 8 ++-- src/lib/elementary/elm_photo.c | 6 +-- src/lib/elementary/elm_plug.c | 6 +-- src/lib/elementary/elm_priv.h | 4 +- src/lib/elementary/elm_route.c | 6 +-- src/lib/elementary/elm_scroller.c | 6 +-- src/lib/elementary/elm_segment_control.c | 6 +-- src/lib/elementary/elm_separator.c | 6 +-- src/lib/elementary/elm_spinner.c | 6 +-- src/lib/elementary/elm_table.c | 6 +-- src/lib/elementary/elm_theme.c | 12 ++--- src/lib/elementary/elm_toolbar.c | 10 ++-- src/lib/elementary/elm_widget.c | 22 ++++----- src/lib/elementary/elm_widget.eo | 49 +++++++++++--------- src/lib/elementary/elm_widget.h | 6 +-- 65 files changed, 309 insertions(+), 259 deletions(-) diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c index f19d840adc..01b978ea5c 100644 --- a/src/lib/elementary/efl_ui_button.c +++ b/src/lib/elementary/efl_ui_button.c @@ -120,13 +120,13 @@ _icon_signal_emit(Evas_Object *obj) /* FIXME: replicated from elm_layout just because button's icon spot * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we * can changed the theme API */ -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _efl_ui_button_elm_widget_theme_apply(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _icon_signal_emit(obj); return int_ret; diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c index 193f1b19d8..15d0252266 100644 --- a/src/lib/elementary/efl_ui_check.c +++ b/src/lib/elementary/efl_ui_check.c @@ -165,16 +165,16 @@ _efl_ui_check_elm_widget_widget_event(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSE return EINA_TRUE; } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _efl_ui_check_elm_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUSED) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; if (efl_ui_nstate_value_get(obj) == 0) elm_layout_signal_emit(obj, "elm,state,check,off", "elm"); diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c index 98bd90bc95..d936332631 100644 --- a/src/lib/elementary/efl_ui_clock.c +++ b/src/lib/elementary/efl_ui_clock.c @@ -559,10 +559,10 @@ _efl_ui_clock_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Clock_Data *sd) evas_object_size_hint_max_set(obj, -1, -1); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _efl_ui_clock_elm_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; Clock_Field *field; char buf[BUFFER_SIZE]; @@ -571,7 +571,7 @@ _efl_ui_clock_elm_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; if ((!dt_mod) || (!dt_mod->field_value_display)) return EINA_TRUE; diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c index e557299bec..eb737b8a0c 100644 --- a/src/lib/elementary/efl_ui_flip.c +++ b/src/lib/elementary/efl_ui_flip.c @@ -97,12 +97,12 @@ _sizing_eval(Evas_Object *obj) evas_object_size_hint_max_set(obj, maxw, maxh); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _efl_ui_flip_elm_widget_theme_apply(Eo *obj, Efl_Ui_Flip_Data *sd EINA_UNUSED) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _sizing_eval(obj); diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c index 131d9dd921..181db543d5 100644 --- a/src/lib/elementary/efl_ui_grid.c +++ b/src/lib/elementary/efl_ui_grid.c @@ -112,12 +112,12 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl) evas_object_table_mirrored_set(wd->resize_obj, rtl); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _efl_ui_grid_elm_widget_theme_apply(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _mirrored_set(obj, efl_ui_mirrored_get(obj)); diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index 320b782d1c..9de08067c4 100644 --- a/src/lib/elementary/efl_ui_image.c +++ b/src/lib/elementary/efl_ui_image.c @@ -705,16 +705,16 @@ _efl_ui_image_efl_canvas_object_clip_set(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Ob if (sd->prev_img) evas_object_clip_set(sd->prev_img, clip); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _efl_ui_image_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; if (sd->stdicon) _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj)); int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _efl_ui_image_sizing_eval(obj); diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c index 707d71e7ad..e01fbd292c 100644 --- a/src/lib/elementary/efl_ui_image_zoomable.c +++ b/src/lib/elementary/efl_ui_image_zoomable.c @@ -885,17 +885,17 @@ _efl_ui_image_zoomable_elm_widget_on_focus(Eo *obj, Efl_Ui_Image_Zoomable_Data * return EINA_TRUE; } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _efl_ui_image_zoomable_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd EINA_UNUSED) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; Eina_Bool fdo = EINA_FALSE; if (sd->stdicon) _internal_efl_ui_image_zoomable_icon_set(obj, sd->stdicon, &fdo, EINA_TRUE); int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _sizing_eval(obj); diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c index 934c86d5d4..ce6a49d88b 100644 --- a/src/lib/elementary/efl_ui_layout.c +++ b/src/lib/elementary/efl_ui_layout.c @@ -349,12 +349,12 @@ _efl_ui_layout_elm_widget_disable(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED) return EINA_TRUE; } -static Elm_Theme_Apply +static Efl_Ui_Theme_Apply _efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Data *sd) { - Elm_Theme_Apply ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply ret = EFL_UI_THEME_APPLY_FAILED; - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); /* function already prints error messages, if any */ if (!sd->file_set) @@ -368,18 +368,18 @@ _efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Data *sd) efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL); if (!_visuals_refresh(obj, sd)) - ret = ELM_THEME_APPLY_FAILED; + ret = EFL_UI_THEME_APPLY_FAILED; return ret; } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _efl_ui_layout_elm_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd) { - Elm_Theme_Apply theme_apply = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply theme_apply = EFL_UI_THEME_APPLY_FAILED; theme_apply = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!theme_apply) return ELM_THEME_APPLY_FAILED; + if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED; theme_apply &= _efl_ui_layout_theme_internal(obj, sd); return theme_apply; @@ -895,7 +895,7 @@ _efl_ui_layout_efl_file_mmap_get(Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, co efl_file_mmap_get(wd->resize_obj, file, group); } -EOLIAN static Eina_Bool +EOLIAN static Efl_Ui_Theme_Apply _efl_ui_layout_theme_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *klass, const char *group, const char *style) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); @@ -905,10 +905,7 @@ _efl_ui_layout_theme_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *klass, con eina_stringshare_replace(&(sd->group), group); eina_stringshare_replace(&(wd->style), style); - if (_efl_ui_layout_theme_internal(obj, sd)) - return EINA_TRUE; - else - return EINA_FALSE; + return _efl_ui_layout_theme_internal(obj, sd); } EOLIAN static void @@ -2483,6 +2480,15 @@ elm_layout_data_get(const Evas_Object *obj, const char *key) return efl_canvas_layout_group_data_get(obj, key); } +EAPI Eina_Bool +elm_layout_theme_set(Evas_Object *obj, const char *klass, const char *group, const char *style) +{ + Efl_Ui_Theme_Apply ta; + + ta = efl_ui_layout_theme_set(obj, klass, group, style); + return (ta != EFL_UI_THEME_APPLY_FAILED); +} + /* End of legacy only */ diff --git a/src/lib/elementary/efl_ui_layout.eo b/src/lib/elementary/efl_ui_layout.eo index 22c65fcfea..7c6519900f 100644 --- a/src/lib/elementary/efl_ui_layout.eo +++ b/src/lib/elementary/efl_ui_layout.eo @@ -4,7 +4,6 @@ class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File, Efl.Canvas.Layout_Group) { [[Elementary layout class]] - legacy_prefix: elm_layout; methods { @property theme { [[The theme of this widget, defines which edje group will be used. @@ -19,20 +18,27 @@ class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File, ]] set { [[Sets the edje group from the elementary theme that will be used - as layout. - - Note that $style will be the new style of this object, as in an - @Elm.Widget.style. + as layout. Note that $style will be the new style of this object, + as in an @Elm.Widget.style. As a consequence this function can + only be called during construction of the object, before finalize. If this returns $false the widget is very likely to become non-functioning. ]] - return: bool; [[$true on success, $false otherwise]] + return: Efl.Ui.Theme.Apply(0); + [[Whether the style was successfully applied or not, see + the values of @Efl.Ui.Theme.Apply for more information.]] } + /* + TODO: + get { + [[Get information about the current theme in use.]] + } + */ values { klass: string; [[The class of the group, eg. "button".]] group: string("base"); [[The group, eg. "base".]] - style: string("default"); [[The style to used, eg "default".]] + style: string("default"); [[The style to use, eg "default".]] } } } diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c index 3f9b6c3a58..8fe122ea01 100644 --- a/src/lib/elementary/efl_ui_nstate.c +++ b/src/lib/elementary/efl_ui_nstate.c @@ -138,13 +138,13 @@ _efl_ui_nstate_value_set(Eo *obj, Efl_Ui_Nstate_Data *pd, int state) _state_active(obj, pd); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _efl_ui_nstate_elm_widget_theme_apply(Eo *obj, Efl_Ui_Nstate_Data *pd) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _state_active(obj, pd); diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c index dac9cb5dea..869b94c0d8 100644 --- a/src/lib/elementary/efl_ui_panes.c +++ b/src/lib/elementary/efl_ui_panes.c @@ -44,13 +44,13 @@ static const Elm_Layout_Part_Alias_Description _content_aliases[] = {NULL, NULL} }; -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _efl_ui_panes_elm_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd) { double size; Evas_Coord minw = 0, minh = 0; - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; EFL_UI_LAYOUT_DATA_GET(obj, ld); if (sd->orientation == EFL_ORIENT_HORIZONTAL) @@ -63,7 +63,7 @@ _efl_ui_panes_elm_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd) evas_object_size_hint_min_set(sd->event, minw, minh); int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; size = elm_panes_content_left_size_get(obj); diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c index 383ef1a379..d7327639e9 100644 --- a/src/lib/elementary/efl_ui_progressbar.c +++ b/src/lib/elementary/efl_ui_progressbar.c @@ -190,19 +190,19 @@ _efl_ui_progressbar_content_set(Eo *obj, Efl_Ui_Progressbar_Data *_pd EINA_UNUSE return EINA_TRUE; } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _efl_ui_progressbar_elm_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *sd) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; EFL_UI_LAYOUT_DATA_GET(obj, ld); - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); if (_is_horizontal(sd->orientation)) eina_stringshare_replace(&ld->group, "horizontal"); else eina_stringshare_replace(&ld->group, "vertical"); int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; if (sd->pulse) elm_layout_signal_emit(obj, "elm,state,pulse", "elm"); diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c index 464059d025..ef5d4af6e8 100644 --- a/src/lib/elementary/efl_ui_radio.c +++ b/src/lib/elementary/efl_ui_radio.c @@ -162,13 +162,13 @@ _icon_signal_emit(Evas_Object *obj) edje_object_message_signal_process(wd->resize_obj); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _efl_ui_radio_elm_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd) { - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; if (sd->state) elm_layout_signal_emit(obj, "elm,state,radio,on", "elm"); else elm_layout_signal_emit(obj, "elm,state,radio,off", "elm"); diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c index 3745f2d8c7..9b32a1b7ca 100644 --- a/src/lib/elementary/efl_ui_slider.c +++ b/src/lib/elementary/efl_ui_slider.c @@ -743,12 +743,12 @@ _popup_add(Efl_Ui_Slider_Data *sd, Eo *obj, Evas_Object **popup, } } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _efl_ui_slider_elm_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; EFL_UI_LAYOUT_DATA_GET(obj, ld); - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); if (_is_horizontal(sd->orientation)) { @@ -783,7 +783,7 @@ _efl_ui_slider_elm_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd) } int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; if (sd->popup) { diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index 6d04306f01..147509dc98 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -907,19 +907,19 @@ _efl_ui_text_background_switch(Evas_Object *from_edje, Evas_Object *to_edje) /* we can't issue the layout's theming code here, cause it assumes an * unique edje object, always */ -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _efl_ui_text_elm_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd) { const char *str; const char *style = elm_widget_style_get(obj); - Elm_Theme_Apply theme_apply; + Efl_Ui_Theme_Apply theme_apply; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); // Note: We are skipping elm_layout here! This is by design. // This assumes the following inheritance: my_class -> layout -> widget ... theme_apply = elm_obj_widget_theme_apply(efl_cast(obj, ELM_WIDGET_CLASS)); - if (!theme_apply) return ELM_THEME_APPLY_FAILED; + if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED; evas_event_freeze(evas_object_evas_get(obj)); @@ -986,7 +986,7 @@ _efl_ui_text_elm_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd) if (sd->scroll) { - Elm_Theme_Apply ok = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply ok = EFL_UI_THEME_APPLY_FAILED; elm_interface_scrollable_mirrored_set(obj, efl_ui_mirrored_get(obj)); 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, void *event_info); static void _elm_win_img_callbacks_del(Evas_Object *obj, Evas_Object *imgobj); -static Elm_Theme_Apply _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd); +static Efl_Ui_Theme_Apply _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd); static void _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style); static void _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool calc); static 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 return sd->focus_highlight.enabled; } -static Elm_Theme_Apply +static Efl_Ui_Theme_Apply _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; Eina_Bool ret = EINA_FALSE, prev_alpha; const char *s; int_ret = _elm_theme_object_set(obj, sd->legacy.edje, "win", "base", elm_widget_style_get(obj)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; edje_object_mirrored_set(sd->legacy.edje, efl_ui_mirrored_get(obj)); edje_object_scale_set(sd->legacy.edje, @@ -6304,7 +6304,7 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd) efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_THEME_CHANGED, NULL); ret = elm_obj_widget_disable(obj); - if (!ret) int_ret = ELM_THEME_APPLY_FAILED; + if (!ret) int_ret = EFL_UI_THEME_APPLY_FAILED; prev_alpha = sd->theme_alpha; s = edje_object_data_get(sd->legacy.edje, "alpha"); @@ -6315,17 +6315,17 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd) return int_ret; } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _efl_ui_win_elm_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; sd->focus_highlight.theme_changed = EINA_TRUE; int_ret = _elm_win_theme_internal(obj, sd) & int_ret; - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _elm_win_focus_highlight_reconfigure_job_start(sd); return int_ret; diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c index 0704f0d39a..bd745c774d 100644 --- a/src/lib/elementary/elc_combobox.c +++ b/src/lib/elementary/elc_combobox.c @@ -56,15 +56,15 @@ _elm_combobox_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Combobox_Data *sd) return EINA_TRUE; } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_combobox_elm_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd) { const char *style; - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; Eina_Bool mirrored; char buf[128]; - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); style = eina_stringshare_add(elm_widget_style_get(obj)); @@ -74,7 +74,7 @@ _elm_combobox_elm_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd) eina_stringshare_replace(&(wd->style), buf); int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; eina_stringshare_replace(&(wd->style), style); diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c index 8eb858ab0f..1a2071044e 100644 --- a/src/lib/elementary/elc_ctxpopup.c +++ b/src/lib/elementary/elc_ctxpopup.c @@ -746,13 +746,13 @@ _on_content_resized(void *data, } //FIXME: lost the content size when theme hook is called. -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_ctxpopup_elm_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; elm_widget_theme_object_set (obj, sd->bg, "ctxpopup", "bg", elm_widget_style_get(obj)); diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c index 25293ad3e1..7ecadc659a 100644 --- a/src/lib/elementary/elc_fileselector.c +++ b/src/lib/elementary/elc_fileselector.c @@ -227,16 +227,16 @@ _model_str_property_set(Efl_Model *model, const char *property_name, const char return r; } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_fileselector_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd) { const char *style; const char *data; char buf[1024]; - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; style = elm_widget_style_get(obj); _mirrored_set(obj, efl_ui_mirrored_get(obj)); diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c index 3ee7116434..1c670124fe 100644 --- a/src/lib/elementary/elc_fileselector_button.c +++ b/src/lib/elementary/elc_fileselector_button.c @@ -42,15 +42,15 @@ _model_free_eo_cb(void *eo) efl_unref(eo); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_fileselector_button_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Button_Data *sd EINA_UNUSED) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; char buf[4096]; const char *style; - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); style = eina_stringshare_add(elm_widget_style_get(obj)); @@ -60,7 +60,7 @@ _elm_fileselector_button_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Button eina_stringshare_replace(&(wd->style), buf); int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; eina_stringshare_replace(&(wd->style), style); diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c index 12b024e13c..b75e7affb0 100644 --- a/src/lib/elementary/elc_fileselector_entry.c +++ b/src/lib/elementary/elc_fileselector_entry.c @@ -207,17 +207,17 @@ _elm_fileselector_entry_elm_widget_focus_next(Eo *obj EINA_UNUSED, Elm_Fileselec return EINA_FALSE; } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_fileselector_entry_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_Data *sd) { const char *style; char buf[1024]; - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; style = elm_widget_style_get(obj); diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c index 647ae143b0..4ea96791db 100644 --- a/src/lib/elementary/elc_hoversel.c +++ b/src/lib/elementary/elc_hoversel.c @@ -62,14 +62,14 @@ _elm_hoversel_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd) return EINA_TRUE; } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_hoversel_elm_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; Eina_List *l; Elm_Object_Item *eo_item; - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); char buf[4096]; const char *style; @@ -85,7 +85,7 @@ _elm_hoversel_elm_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd) eina_stringshare_replace(&(wd->style), buf); int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; eina_stringshare_replace(&(wd->style), style); diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c index 0547901b81..edcb604780 100644 --- a/src/lib/elementary/elc_multibuttonentry.c +++ b/src/lib/elementary/elc_multibuttonentry.c @@ -86,7 +86,7 @@ _format_count(int count, void *data EINA_UNUSED) return strdup(buf); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_multibuttonentry_elm_widget_theme_apply(Eo *obj, Elm_Multibuttonentry_Data *sd) { const char *str; @@ -95,9 +95,9 @@ _elm_multibuttonentry_elm_widget_theme_apply(Eo *obj, Elm_Multibuttonentry_Data Elm_Object_Item *eo_item; double pad_scale; - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; str = elm_layout_data_get(obj, "horizontal_pad"); if (str) hpad = atoi(str); diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c index 0453fe04fc..42f5a40c98 100644 --- a/src/lib/elementary/elc_naviframe.c +++ b/src/lib/elementary/elc_naviframe.c @@ -394,7 +394,7 @@ _item_title_enabled_update(Elm_Naviframe_Item_Data *nit, Eina_Bool transition) edje_object_message_signal_process(elm_layout_edje_get(VIEW(nit))); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_naviframe_elm_widget_theme_apply(Eo *obj, Elm_Naviframe_Data *sd) { Elm_Naviframe_Item_Data *it; @@ -412,7 +412,7 @@ _elm_naviframe_elm_widget_theme_apply(Eo *obj, Elm_Naviframe_Data *sd) } elm_layout_sizing_eval(obj); - return ELM_THEME_APPLY_SUCCESS; + return EFL_UI_THEME_APPLY_SUCCESS; } static char * diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c index 1e96b58809..d5f621c7d4 100644 --- a/src/lib/elementary/elc_player.c +++ b/src/lib/elementary/elc_player.c @@ -199,12 +199,12 @@ _update_theme_slider(Evas_Object *obj, Evas_Object *sl, const char *name, const elm_object_disabled_set(sl, elm_widget_disabled_get(obj)); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_player_elm_widget_theme_apply(Eo *obj, Elm_Player_Data *sd) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _update_theme_button(obj, sd->forward, "forward"); _update_theme_button(obj, sd->info, "info"); diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index b404567308..a5d3b782be 100644 --- a/src/lib/elementary/elc_popup.c +++ b/src/lib/elementary/elc_popup.c @@ -355,7 +355,7 @@ _populate_theme_scroll(Elm_Popup_Data *sd) sd->theme_scroll = EINA_FALSE; } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_popup_elm_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd) { Elm_Popup_Item_Data *it; @@ -429,7 +429,7 @@ _elm_popup_elm_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd) /* access */ if (_elm_config->access_mode) _access_obj_process(obj, EINA_TRUE); - return ELM_THEME_APPLY_SUCCESS; + return EFL_UI_THEME_APPLY_SUCCESS; } static void diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c index 213f338d14..0c4a5f4bc6 100644 --- a/src/lib/elementary/elm_actionslider.c +++ b/src/lib/elementary/elm_actionslider.c @@ -112,18 +112,18 @@ _mirroredness_change_eval(Evas_Object *obj) (wd->resize_obj, "elm.drag_button_base", 1.0 - pos, 0.5); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_actionslider_elm_widget_theme_apply(Eo *obj, Elm_Actionslider_Data *sd EINA_UNUSED) { Eina_Bool mirrored; - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); mirrored = elm_object_mirrored_get(obj); int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; if (elm_object_mirrored_get(obj) != mirrored) _mirroredness_change_eval(obj); diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c index 0a5d2ac8af..9f8cc47838 100644 --- a/src/lib/elementary/elm_box.c +++ b/src/lib/elementary/elm_box.c @@ -114,15 +114,15 @@ _elm_box_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elm_Box_Data *_pd EINA_ (obj, base, items, list_data_get, degree, direction, direction_item, weight); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_box_elm_widget_theme_apply(Eo *obj, Elm_Box_Data *sd EINA_UNUSED) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); evas_object_smart_calculate(wd->resize_obj); return int_ret; diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c index ecab31334a..f75e182a83 100644 --- a/src/lib/elementary/elm_calendar.c +++ b/src/lib/elementary/elm_calendar.c @@ -876,13 +876,13 @@ _spinner_buttons_add(Evas_Object *obj, Elm_Calendar_Data *sd) } } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_calendar_elm_widget_theme_apply(Eo *obj, Elm_Calendar_Data *sd) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _spinner_buttons_add(obj, sd); diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c index 06bc876a09..2486cb075c 100644 --- a/src/lib/elementary/elm_clock.c +++ b/src/lib/elementary/elm_clock.c @@ -560,13 +560,13 @@ _time_update(Evas_Object *obj, Eina_Bool theme_update) sd->cur.ampm = -1; } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_clock_elm_widget_theme_apply(Eo *obj, Elm_Clock_Data *sd EINA_UNUSED) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _time_update(obj, EINA_TRUE); diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index 334c2ee369..aa6404d4e5 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -1292,7 +1292,7 @@ _color_bars_add(Evas_Object *obj) } } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_colorselector_elm_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd) { int i; @@ -1303,11 +1303,11 @@ _elm_colorselector_elm_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd) unsigned int h_pad = DEFAULT_HOR_PAD; unsigned int v_pad = DEFAULT_VER_PAD; - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; if ((sd->mode == ELM_COLORSELECTOR_PALETTE) || (sd->mode == ELM_COLORSELECTOR_ALL) || diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c index 6cd6b77222..c7cb1f7950 100644 --- a/src/lib/elementary/elm_conform.c +++ b/src/lib/elementary/elm_conform.c @@ -569,13 +569,13 @@ _on_rotation_changed(void *data, const Efl_Event *event EINA_UNUSED) } } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_conformant_elm_widget_theme_apply(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _conformant_parts_swallow(obj); diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c index bd98932e9a..7d85d16f11 100644 --- a/src/lib/elementary/elm_dayselector.c +++ b/src/lib/elementary/elm_dayselector.c @@ -123,17 +123,17 @@ _item_location_get(Elm_Dayselector_Data *sd, ELM_DAYSELECTOR_MAX; } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_dayselector_elm_widget_theme_apply(Eo *obj, Elm_Dayselector_Data *sd) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; Eina_List *l; char buf[1024]; Elm_Dayselector_Item_Data *it; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; EINA_LIST_FOREACH(sd->items, l, it) { diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c index 860643f4e6..e243196017 100644 --- a/src/lib/elementary/elm_diskselector.c +++ b/src/lib/elementary/elm_diskselector.c @@ -812,18 +812,18 @@ _theme_data_get(Evas_Object *obj) else sd->minh = -1; } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_diskselector_elm_widget_theme_apply(Eo *obj, Elm_Diskselector_Data *sd) { Eina_List *l; Elm_Diskselector_Item_Data *it; Evas_Object *blank; - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; Evas *evas; const char *style = elm_widget_style_get(obj); int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; evas = evas_object_evas_get(obj); evas_event_freeze(evas); diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index 5f37440007..3c9603a79b 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -855,21 +855,21 @@ _elm_entry_background_switch(Evas_Object *from_edje, Evas_Object *to_edje) /* we can't issue the layout's theming code here, cause it assumes an * unique edje object, always */ -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd) { const char *str; const char *t; const char *stl_user; const char *style = elm_widget_style_get(obj); - Elm_Theme_Apply theme_apply; + Efl_Ui_Theme_Apply theme_apply; - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); // Note: We are skipping elm_layout here! This is by design. // This assumes the following inheritance: my_class -> layout -> widget ... theme_apply = elm_obj_widget_theme_apply(efl_cast(obj, ELM_WIDGET_CLASS)); - if (!theme_apply) return ELM_THEME_APPLY_FAILED; + if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED; evas_event_freeze(evas_object_evas_get(obj)); @@ -949,7 +949,7 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd) if (sd->scroll) { - Elm_Theme_Apply ok = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply ok = EFL_UI_THEME_APPLY_FAILED; elm_interface_scrollable_mirrored_set(obj, efl_ui_mirrored_get(obj)); diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c index b2597109da..4176ce9312 100644 --- a/src/lib/elementary/elm_flipselector.c +++ b/src/lib/elementary/elm_flipselector.c @@ -350,16 +350,16 @@ _item_new(Evas_Object *obj, return eo_item; } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_flipselector_elm_widget_theme_apply(Eo *obj, Elm_Flipselector_Data *sd) { const char *max_len; - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; max_len = edje_object_data_get(wd->resize_obj, "max_len"); if (!max_len) sd->max_len = MAX_LEN_DEFAULT; diff --git a/src/lib/elementary/elm_general.eot b/src/lib/elementary/elm_general.eot index 543bfa6f67..cf52477d71 100644 --- a/src/lib/elementary/elm_general.eot +++ b/src/lib/elementary/elm_general.eot @@ -1,3 +1,17 @@ +enum Efl.Ui.Theme.Apply +{ + [[Return error code when setting the style on a widget.]] + failed = 0, [[Failed to apply theme. The widget may become unusable.]] + default = 1, [[Successfully applied the default style. The widget may + look different from the rest of the UI if a custom theme + is in use, but it should be usable.]] + success = 3 [[Successfully applied the requested style from the current + theme.]] +} + + +/* The below Elm names need to be cleaned up... */ + struct Elm.Event.Policy_Changed { [[Data on the event when an Elementary policy has changed]] diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index 3c00629d82..3808a60969 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -1121,10 +1121,10 @@ _view_style_update(Elm_Gen_Item *it, Evas_Object *view, const char *style) ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd); snprintf(buf, sizeof(buf), "item/%s", style ? style : "default"); - Elm_Theme_Apply th_ret = + Efl_Ui_Theme_Apply th_ret = elm_widget_theme_object_set(WIDGET(it), view, "gengrid", buf, elm_widget_style_get(WIDGET(it))); - if (th_ret == ELM_THEME_APPLY_FAILED) + if (th_ret == EFL_UI_THEME_APPLY_FAILED) { ERR("%s is not a valid gengrid item style. " "Automatically falls back into default style.", @@ -3658,12 +3658,12 @@ _mirrored_set(Evas_Object *obj, } } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_gengrid_elm_widget_theme_apply(Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _mirrored_set(obj, efl_ui_mirrored_get(obj)); diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index f9fc39c5f7..140ff61ef1 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -542,10 +542,10 @@ _view_style_update(Elm_Gen_Item *it, Evas_Object *view, const char *style) "",style ? : "default"); } - Elm_Theme_Apply th_ret = + Efl_Ui_Theme_Apply th_ret = elm_widget_theme_object_set(WIDGET(it), view, "genlist", buf, elm_widget_style_get(WIDGET(it))); - if (th_ret == ELM_THEME_APPLY_FAILED) + if (th_ret == EFL_UI_THEME_APPLY_FAILED) { ERR("%s is not a valid genlist item style. " "Automatically falls back into default style.", @@ -3439,16 +3439,16 @@ _mirrored_set(Evas_Object *obj, elm_interface_scrollable_mirrored_set(obj, rtl); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_genlist_elm_widget_theme_apply(Eo *obj, Elm_Genlist_Data *sd) { Item_Block *itb; - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; Eina_List *l; Elm_Gen_Item *it; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; evas_event_freeze(evas_object_evas_get(obj)); _mirrored_set(obj, efl_ui_mirrored_get(obj)); diff --git a/src/lib/elementary/elm_grid.c b/src/lib/elementary/elm_grid.c index 7a8e050d40..fcccfb06c4 100644 --- a/src/lib/elementary/elm_grid.c +++ b/src/lib/elementary/elm_grid.c @@ -112,13 +112,13 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl) evas_object_grid_mirrored_set(wd->resize_obj, rtl); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_grid_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _mirrored_set(obj, efl_ui_mirrored_get(obj)); diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c index d4581cdf39..322f33f9df 100644 --- a/src/lib/elementary/elm_hover.c +++ b/src/lib/elementary/elm_hover.c @@ -297,12 +297,12 @@ _hov_show_do(Evas_Object *obj) } } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_hover_elm_widget_theme_apply(Eo *obj, Elm_Hover_Data *sd) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; if (sd->smt_sub) _elm_hover_smt_sub_re_eval(obj); diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c index 8ae6e6a0ba..0941cd90c0 100644 --- a/src/lib/elementary/elm_icon.c +++ b/src/lib/elementary/elm_icon.c @@ -363,16 +363,16 @@ _elm_icon_efl_file_file_set(Eo *obj, Elm_Icon_Data *sd, const char *file, const return EINA_TRUE; } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_icon_elm_widget_theme_apply(Eo *obj, Elm_Icon_Data *sd) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; if (sd->stdicon) _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj)); int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; return int_ret; } diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c index 2de781ecd1..7bc387c062 100644 --- a/src/lib/elementary/elm_index.c +++ b/src/lib/elementary/elm_index.c @@ -439,13 +439,13 @@ _index_priority_change(void *data, Elm_Index_Item_Data *it) } } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_index_elm_widget_theme_apply(Eo *obj, Elm_Index_Data *sd) { Evas_Coord minw = 0, minh = 0; Elm_Object_Item *eo_item; - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); EFL_UI_LAYOUT_DATA_GET(obj, ld); @@ -459,7 +459,7 @@ _elm_index_elm_widget_theme_apply(Eo *obj, Elm_Index_Data *sd) eina_stringshare_replace(&ld->group, "base/vertical"); int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; elm_coords_finger_size_adjust(1, &minw, 1, &minh); evas_object_size_hint_min_set(sd->event_rect[0], minw, minh); diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c index d3c8fba696..6a451df3c7 100644 --- a/src/lib/elementary/elm_label.c +++ b/src/lib/elementary/elm_label.c @@ -181,17 +181,17 @@ _elm_label_horizontal_size_policy_update(Eo *obj, Elm_Label_Data *sd) edje_object_message_signal_process(wd->resize_obj); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_label_elm_widget_theme_apply(Eo *obj, Elm_Label_Data *sd) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); evas_event_freeze(evas_object_evas_get(obj)); int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _elm_label_horizontal_size_policy_update(obj, sd); diff --git a/src/lib/elementary/elm_layout_legacy.h b/src/lib/elementary/elm_layout_legacy.h index e59699ff66..2bd77e529b 100644 --- a/src/lib/elementary/elm_layout_legacy.h +++ b/src/lib/elementary/elm_layout_legacy.h @@ -40,6 +40,23 @@ typedef struct _Elm_Layout_Part_Alias_Description Elm_Layout_Part_Alias_Descript */ EAPI Evas_Object *elm_layout_add(Evas_Object *parent); +/** + * @brief Set the edje group from the elementary theme that will be used as + * layout. + * + * Note that @c style will be the new style of @c obj too, as in an @ref + * elm_object_style_set call. + * + * @param[in] klass The class of the group. + * @param[in] group The group. + * @param[in] style The style to used. + * + * @return @c true on success, @c false otherwise + * + * @ingroup Elm_Layout + */ +EAPI Eina_Bool elm_layout_theme_set(Evas_Object *obj, const char *klass, const char *group, const char *style); + /** * @brief Get the edje data from the given layout. * diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c index 64af470014..d71ac4f488 100644 --- a/src/lib/elementary/elm_list.c +++ b/src/lib/elementary/elm_list.c @@ -1092,15 +1092,15 @@ _mirrored_set(Evas_Object *obj, } } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_list_elm_widget_theme_apply(Eo *obj, Elm_List_Data *sd) { Elm_Object_Item *eo_it; Eina_List *n; - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _mirrored_set(obj, efl_ui_mirrored_get(obj)); diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c index a3beee1cfb..b765b41f94 100644 --- a/src/lib/elementary/elm_map.c +++ b/src/lib/elementary/elm_map.c @@ -3981,13 +3981,13 @@ _elm_map_pan_class_constructor(Efl_Class *klass) #include "elm_map_pan.eo.c" -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_map_elm_widget_theme_apply(Eo *obj, Elm_Map_Data *sd EINA_UNUSED) { - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; elm_widget_theme_object_set diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c index 2f51bef7b2..352b0df59a 100644 --- a/src/lib/elementary/elm_mapbuf.c +++ b/src/lib/elementary/elm_mapbuf.c @@ -35,12 +35,12 @@ _sizing_eval(Evas_Object *obj) evas_object_size_hint_max_set(obj, maxw, maxh); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_mapbuf_elm_widget_theme_apply(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _sizing_eval(obj); diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c index 8f8bf96e64..a4baf34b8f 100644 --- a/src/lib/elementary/elm_menu.c +++ b/src/lib/elementary/elm_menu.c @@ -229,10 +229,10 @@ _sizing_eval(Evas_Object *obj) } } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_menu_elm_widget_theme_apply(Eo *obj, Elm_Menu_Data *sd) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; Eina_List *l, *_l, *_ll, *ll = NULL; Elm_Object_Item *eo_item; @@ -240,7 +240,7 @@ _elm_menu_elm_widget_theme_apply(Eo *obj, Elm_Menu_Data *sd) char style[1024]; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; if (sd->menu_bar) snprintf(style, sizeof(style), "main_menu/%s", elm_widget_style_get(obj)); diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c index cd8f77f61e..0e178a1297 100644 --- a/src/lib/elementary/elm_notify.c +++ b/src/lib/elementary/elm_notify.c @@ -19,7 +19,7 @@ #define MY_CLASS_NAME "Elm_Notify" #define MY_CLASS_NAME_LEGACY "elm_notify" -static Elm_Theme_Apply +static Efl_Ui_Theme_Apply _notify_theme_apply(Evas_Object *obj) { const char *style = elm_widget_style_get(obj); @@ -140,12 +140,12 @@ _sizing_eval(Evas_Object *obj) evas_object_resize(obj, w, h); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_notify_elm_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _mirrored_set(obj, efl_ui_mirrored_get(obj)); diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index 7afddfa188..5c6ee593d2 100644 --- a/src/lib/elementary/elm_panel.c +++ b/src/lib/elementary/elm_panel.c @@ -212,18 +212,18 @@ _scrollable_layout_theme_set(Eo *obj, Elm_Panel_Data *sd) _access_obj_process(obj, EINA_TRUE); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_panel_elm_widget_theme_apply(Eo *obj, Elm_Panel_Data *sd) { const char *str; Evas_Coord minw = 0, minh = 0; - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _mirrored_set(obj, efl_ui_mirrored_get(obj)); diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c index 5595559354..d45f38ccc8 100644 --- a/src/lib/elementary/elm_photo.c +++ b/src/lib/elementary/elm_photo.c @@ -49,14 +49,14 @@ _sizing_eval(Evas_Object *obj) evas_object_size_hint_max_set(obj, maxw, maxh); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_photo_elm_widget_theme_apply(Eo *obj, Elm_Photo_Data *sd) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; edje_object_mirrored_set (wd->resize_obj, efl_ui_mirrored_get(obj)); diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c index 6bcc4a88b7..05be43271a 100644 --- a/src/lib/elementary/elm_plug.c +++ b/src/lib/elementary/elm_plug.c @@ -80,12 +80,12 @@ _elm_plug_elm_widget_on_focus(Eo *obj, void *sd EINA_UNUSED, Elm_Object_Item *it return EINA_TRUE; } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_plug_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _sizing_eval(obj); diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h index 5435e4557b..763b2ba8c5 100644 --- a/src/lib/elementary/elm_priv.h +++ b/src/lib/elementary/elm_priv.h @@ -391,7 +391,7 @@ void _elm_win_standard_init(Eo *win); Ecore_X_Window _elm_ee_xwin_get(const Ecore_Evas *ee); -Elm_Theme_Apply _elm_theme_object_set(Evas_Object *parent, +Efl_Ui_Theme_Apply _elm_theme_object_set(Evas_Object *parent, Evas_Object *o, const char *clas, const char *group, @@ -399,7 +399,7 @@ Elm_Theme_Apply _elm_theme_object_set(Evas_Object *parent, Eina_Bool _elm_theme_object_icon_set(Evas_Object *o, const char *group, const char *style); -Elm_Theme_Apply _elm_theme_set(Elm_Theme *th, +Efl_Ui_Theme_Apply _elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *group, diff --git a/src/lib/elementary/elm_route.c b/src/lib/elementary/elm_route.c index 27f7688b1b..df8e24ab00 100644 --- a/src/lib/elementary/elm_route.c +++ b/src/lib/elementary/elm_route.c @@ -86,12 +86,12 @@ _move_resize_cb(void *data EINA_UNUSED, _sizing_eval(obj); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_route_elm_widget_theme_apply(Eo *obj, Elm_Route_Data *sd EINA_UNUSED) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; //TODO diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index cee8c4df75..d0225616aa 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -403,12 +403,12 @@ _mirrored_set(Evas_Object *obj, elm_interface_scrollable_mirrored_set(obj, mirrored); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_scroller_elm_widget_theme_apply(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _mirrored_set(obj, efl_ui_mirrored_get(obj)); diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c index 1d91307855..704a8b7e84 100644 --- a/src/lib/elementary/elm_segment_control.c +++ b/src/lib/elementary/elm_segment_control.c @@ -215,16 +215,16 @@ _update_list(Elm_Segment_Control_Data *sd) } } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_segment_control_elm_widget_theme_apply(Eo *obj, Elm_Segment_Control_Data *sd) { Eina_List *l; Eina_Bool rtl; Elm_Object_Item *eo_item; - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; rtl = efl_ui_mirrored_get(obj); diff --git a/src/lib/elementary/elm_separator.c b/src/lib/elementary/elm_separator.c index e0ad2a09b2..e9d3952c99 100644 --- a/src/lib/elementary/elm_separator.c +++ b/src/lib/elementary/elm_separator.c @@ -16,10 +16,10 @@ #define MY_CLASS_NAME "Elm_Separator" #define MY_CLASS_NAME_LEGACY "elm_separator" -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_separator_elm_widget_theme_apply(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; EFL_UI_LAYOUT_DATA_GET(obj, ld); if (sd->orientation == EFL_ORIENT_HORIZONTAL) @@ -28,7 +28,7 @@ _elm_separator_elm_widget_theme_apply(Eo *obj, Elm_Separator_Data *sd EINA_UNUSE eina_stringshare_replace(&ld->group, "vertical"); int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; return int_ret; } diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c index 0ea3e389b9..86eb11f68c 100644 --- a/src/lib/elementary/elm_spinner.c +++ b/src/lib/elementary/elm_spinner.c @@ -1266,10 +1266,10 @@ _elm_spinner_efl_canvas_group_group_del(Eo *obj, Elm_Spinner_Data *sd) efl_canvas_group_del(efl_super(obj, MY_CLASS)); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_spinner_elm_widget_theme_apply(Eo *obj, Elm_Spinner_Data *sd) { - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); if (!elm_layout_theme_set(obj, "spinner", "base", elm_widget_style_get(obj))) CRI("Failed to set layout!"); @@ -1315,7 +1315,7 @@ _elm_spinner_elm_widget_theme_apply(Eo *obj, Elm_Spinner_Data *sd) _access_spinner_register(obj, EINA_TRUE); elm_layout_sizing_eval(obj); - return ELM_THEME_APPLY_SUCCESS; + return EFL_UI_THEME_APPLY_SUCCESS; } static Eina_Bool _elm_spinner_smart_focus_next_enable = EINA_FALSE; diff --git a/src/lib/elementary/elm_table.c b/src/lib/elementary/elm_table.c index 39f4754ed3..c3720e11a9 100644 --- a/src/lib/elementary/elm_table.c +++ b/src/lib/elementary/elm_table.c @@ -115,12 +115,12 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl) evas_object_table_mirrored_set(wd->resize_obj, rtl); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_table_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) { - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _mirrored_set(obj, efl_ui_mirrored_get(obj)); diff --git a/src/lib/elementary/elm_theme.c b/src/lib/elementary/elm_theme.c index fe31f74536..3f2144b93d 100644 --- a/src/lib/elementary/elm_theme.c +++ b/src/lib/elementary/elm_theme.c @@ -275,7 +275,7 @@ _elm_theme_data_find(Elm_Theme *th, const char *key) return NULL; } -Elm_Theme_Apply +Efl_Ui_Theme_Apply _elm_theme_object_set(Evas_Object *parent, Evas_Object *o, const char *clas, const char *group, const char *style) { Elm_Theme *th = NULL; @@ -295,13 +295,13 @@ _elm_theme_object_icon_set(Evas_Object *o, return _elm_theme_icon_set(th, o, group, style); } -Elm_Theme_Apply +Efl_Ui_Theme_Apply _elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *group, const char *style) { Eina_File *file; char buf2[1024]; - if ((!clas) || (!group) || (!style) || !o) return ELM_THEME_APPLY_FAILED; + if ((!clas) || (!group) || (!style) || !o) return EFL_UI_THEME_APPLY_FAILED; if (!th) th = &(theme_default); snprintf(buf2, sizeof(buf2), "elm/%s/%s/%s", clas, group, style); if (!eina_hash_find(th->cache_style_load_failed, buf2)) @@ -309,7 +309,7 @@ _elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *grou file = _elm_theme_group_file_find(th, buf2); if (file) { - if (edje_object_mmap_set(o, file, buf2)) return ELM_THEME_APPLY_SUCCESS; + if (edje_object_mmap_set(o, file, buf2)) return EFL_UI_THEME_APPLY_SUCCESS; else { INF("could not set theme group '%s' from file '%s': %s", @@ -333,7 +333,7 @@ _elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *grou { INF("could not set theme style '%s', fallback to default", style); - return ELM_THEME_APPLY_DEFAULT; + return EFL_UI_THEME_APPLY_DEFAULT; } else { @@ -346,7 +346,7 @@ _elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *grou //style not found, add to the not found list eina_hash_add(th->cache_style_load_failed, buf2, (void *)1); } - return ELM_THEME_APPLY_FAILED; + return EFL_UI_THEME_APPLY_FAILED; } Eina_Bool diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index 8a7b66718f..efa8be816c 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -1530,18 +1530,18 @@ _elm_toolbar_highlight_in_theme(Evas_Object *obj) elm_widget_highlight_in_theme_set(obj, EINA_FALSE); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_toolbar_elm_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd) { Elm_Toolbar_Item_Data *it; double scale = 0; - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); - if (sd->delete_me) return ELM_THEME_APPLY_SUCCESS; + if (sd->delete_me) return EFL_UI_THEME_APPLY_SUCCESS; - Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); - if (!int_ret) return ELM_THEME_APPLY_FAILED; + if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; elm_widget_theme_object_set (obj, wd->resize_obj, "toolbar", "base", diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c index 505d545199..b21436b3b5 100644 --- a/src/lib/elementary/elm_widget.c +++ b/src/lib/elementary/elm_widget.c @@ -1187,16 +1187,16 @@ _elm_widget_access(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, { } -EAPI Elm_Theme_Apply +EAPI Efl_Ui_Theme_Apply elm_widget_theme(Evas_Object *obj) { const Eina_List *l; Evas_Object *child; Elm_Tooltip *tt; Elm_Cursor *cur; - Elm_Theme_Apply ret = ELM_THEME_APPLY_SUCCESS; + Efl_Ui_Theme_Apply ret = EFL_UI_THEME_APPLY_SUCCESS; - API_ENTRY return ELM_THEME_APPLY_FAILED; + API_ENTRY return EFL_UI_THEME_APPLY_FAILED; EINA_LIST_FOREACH(sd->subobjs, l, child) if (_elm_widget_is(child)) @@ -1209,7 +1209,7 @@ elm_widget_theme(Evas_Object *obj) EINA_LIST_FOREACH(sd->cursors, l, cur) elm_cursor_theme(cur); - Elm_Theme_Apply ret2 = ELM_THEME_APPLY_FAILED; + Efl_Ui_Theme_Apply ret2 = EFL_UI_THEME_APPLY_FAILED; ret2 = elm_obj_widget_theme_apply(obj); ret &= ret2; @@ -1261,14 +1261,14 @@ elm_widget_theme_specific(Evas_Object *obj, elm_obj_widget_theme_apply(obj); } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_widget_theme_apply(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { _elm_widget_mirrored_reload(obj); if (elm_widget_disabled_get(obj)) elm_widget_disabled_internal(obj, elm_widget_disabled_get(obj)); - return ELM_THEME_APPLY_SUCCESS; + return EFL_UI_THEME_APPLY_SUCCESS; } /** @@ -3928,13 +3928,13 @@ _elm_widget_theme_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) return sd->theme; } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_widget_style_set(Eo *obj, Elm_Widget_Smart_Data *sd, const char *style) { if (eina_stringshare_replace(&sd->style, style)) return elm_widget_theme(obj); - return ELM_THEME_APPLY_SUCCESS; + return EFL_UI_THEME_APPLY_SUCCESS; } EOLIAN static const char* @@ -4030,13 +4030,13 @@ _elm_widget_item_loop_enabled_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd return EINA_FALSE; } -EOLIAN static Elm_Theme_Apply +EOLIAN static Efl_Ui_Theme_Apply _elm_widget_theme_object_set(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle) { - Elm_Theme_Apply ret = _elm_theme_object_set(obj, edj, wname, welement, wstyle); + Efl_Ui_Theme_Apply ret = _elm_theme_object_set(obj, edj, wname, welement, wstyle); if (!ret) { - return ELM_THEME_APPLY_FAILED; + return EFL_UI_THEME_APPLY_FAILED; } if (sd->orient_mode != -1) diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo index 121d6ffd89..5c369ba18b 100644 --- a/src/lib/elementary/elm_widget.eo +++ b/src/lib/elementary/elm_widget.eo @@ -18,14 +18,6 @@ enum Elm.Activate back, [[Activate back]] } -enum Elm.Theme.Apply -{ - [[Return codes when a Elementary theme is applied]] - failed = 0, [[Failed to apply theme]] - default = 1, [[Default return value]] - success = 3 [[Success to apply theme]] -} - struct Elm.Tooltip; [[Elementary tooltip]] struct @extern Elm.Theme; [[Elementary theme]] @@ -65,6 +57,32 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, disabled: bool(false); [[$true if the widget is disabled.]] } } + @property style { + [[The widget style to use. + + Styles define different look and feel for widgets, and may provide + different parts for layout-based widgets. Styles vary from widget + to widget and may be defined by other themes by means of extensions + and overlays. + + The style can only be set before @Efl.Object.finalize, which means + at construction time of the object (inside $efl_add in C). + ]] + set { + [[Can only be called during construction, before finalize.]] + return: Efl.Ui.Theme.Apply(0); + [[Whether the style was successfully applied or not, see + the values of @Efl.Ui.Theme.Apply for more information.]] + } + get { + [[Returns the current style of a widget.]] + } + values { + style: string; + [[Name of the style to use. Refer to each widget's documentation + for the available style names, or to the themes in use.]] + } + } @property focus { [[Focus property]] @@ -119,17 +137,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, disabled: bool; [[$true if orientation mode is disabled, $false otherwise]] } } - @property style { - [[Theme style]] - set { - return: Elm.Theme.Apply; [[Theme style]] - } - get { - } - values { - style: string; [[Style name]] - } - } @property focus_custom_chain { [[A custom chain of objects to pass focus. @@ -218,7 +225,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, @property theme_object { [[Theme object property]] set { - return: Elm.Theme.Apply; [[Theme apply]] + return: Efl.Ui.Theme.Apply; [[Theme apply]] } values { edj: Efl.Canvas.Object; [[Edje object]] @@ -678,7 +685,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, } theme_apply { [['Virtual' function on the widget being re-themed.]] - return: Elm.Theme.Apply; [[Theme apply]] + return: Efl.Ui.Theme.Apply; [[Theme apply]] } focus_direction_get @const { [[Get focus direction]] diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h index 40579b88f8..8c7382fd5b 100644 --- a/src/lib/elementary/elm_widget.h +++ b/src/lib/elementary/elm_widget.h @@ -638,7 +638,7 @@ EAPI Evas_Object *elm_widget_add(Evas_Smart *, Evas_Object *); EAPI void elm_widget_parent_set(Evas_Object *, Evas_Object *); EAPI Eina_Bool elm_widget_api_check(int ver); EAPI Eina_Bool elm_widget_access(Evas_Object *obj, Eina_Bool is_access); -EAPI Elm_Theme_Apply elm_widget_theme(Evas_Object *obj); +EAPI Efl_Ui_Theme_Apply elm_widget_theme(Evas_Object *obj); EAPI void elm_widget_theme_specific(Evas_Object *obj, Elm_Theme *th, Eina_Bool force); EAPI void elm_widget_translate(Evas_Object *obj); EAPI void elm_widget_on_show_region_hook_set(Evas_Object *obj, void (*func)(void *data, Evas_Object *obj), void *data); @@ -733,7 +733,7 @@ EAPI void elm_widget_scroll_freeze_pop(Evas_Object *obj); EAPI int elm_widget_scroll_freeze_get(const Evas_Object *obj); EAPI void elm_widget_theme_set(Evas_Object *obj, Elm_Theme *th); EAPI Elm_Theme *elm_widget_theme_get(const Evas_Object *obj); -EAPI Elm_Theme_Apply elm_widget_style_set(Evas_Object *obj, const char *style); +EAPI Efl_Ui_Theme_Apply elm_widget_style_set(Evas_Object *obj, const char *style); EAPI const char *elm_widget_style_get(const Evas_Object *obj); EAPI void elm_widget_type_set(Evas_Object *obj, const char *type); EAPI const char *elm_widget_type_get(const Evas_Object *obj); @@ -749,7 +749,7 @@ EAPI int elm_widget_drag_child_locked_x_get(const Evas_Object *obj) EAPI int elm_widget_drag_child_locked_y_get(const Evas_Object *obj); EAPI void elm_widget_item_loop_enabled_set(Evas_Object *obj, Eina_Bool enable); EAPI Eina_Bool elm_widget_item_loop_enabled_get(const Evas_Object *obj); -EAPI Elm_Theme_Apply elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle); +EAPI Efl_Ui_Theme_Apply elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle); EAPI Eina_Bool elm_widget_type_check(const Evas_Object *obj, const char *type, const char *func); EAPI Evas_Object *elm_widget_name_find(const Evas_Object *obj, const char *name, int recurse); EAPI Eina_List *elm_widget_stringlist_get(const char *str);