summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSungtaek Hong <sth253.hong@samsung.com>2017-11-17 17:24:39 +0900
committerSungtaek Hong <sth253.hong@samsung.com>2017-12-08 16:02:22 +0900
commit751cf2c0d0d2dff2dcf55f3e49a16924a57e6da7 (patch)
tree65e206687da02a9d27c8f97cf75677585494dce9 /src
parentfc8cc4a9b3407b826d0cf2e17bb0d34399a52d37 (diff)
efl_ui_widget: make Elm.Widget.theme, Elm.Widget.theme_object internal
Diffstat (limited to 'src')
-rw-r--r--src/lib/elementary/efl_ui_bg.c2
-rw-r--r--src/lib/elementary/efl_ui_button.c2
-rw-r--r--src/lib/elementary/efl_ui_calendar.c2
-rw-r--r--src/lib/elementary/efl_ui_clock.c2
-rw-r--r--src/lib/elementary/efl_ui_frame.c2
-rw-r--r--src/lib/elementary/efl_ui_multibuttonentry.c2
-rw-r--r--src/lib/elementary/efl_ui_panes.c2
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c2
-rw-r--r--src/lib/elementary/efl_ui_slider.c6
-rw-r--r--src/lib/elementary/efl_ui_text.c2
-rw-r--r--src/lib/elementary/efl_ui_video.c2
-rw-r--r--src/lib/elementary/efl_ui_win.c18
-rw-r--r--src/lib/elementary/elm_widget.c40
-rw-r--r--src/lib/elementary/elm_widget.eo20
-rw-r--r--src/lib/elementary/els_cursor.c6
15 files changed, 37 insertions, 73 deletions
diff --git a/src/lib/elementary/efl_ui_bg.c b/src/lib/elementary/efl_ui_bg.c
index 38ac41a37c..79991a2179 100644
--- a/src/lib/elementary/efl_ui_bg.c
+++ b/src/lib/elementary/efl_ui_bg.c
@@ -112,7 +112,7 @@ _efl_ui_bg_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Bg_Data *priv)
112 112
113 evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _on_resize, obj); 113 evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _on_resize, obj);
114 114
115 if (!efl_ui_widget_theme_object_set(obj, wd->resize_obj, 115 if (!elm_widget_theme_object_set(obj, wd->resize_obj,
116 elm_widget_theme_klass_get(obj), 116 elm_widget_theme_klass_get(obj),
117 elm_widget_theme_element_get(obj), 117 elm_widget_theme_element_get(obj),
118 elm_widget_theme_style_get(obj))) 118 elm_widget_theme_style_get(obj)))
diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index 5c1dd73035..67abc09622 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -295,7 +295,7 @@ _efl_ui_button_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Button_Data *_pd EINA_
295 295
296 elm_widget_can_focus_set(obj, EINA_TRUE); 296 elm_widget_can_focus_set(obj, EINA_TRUE);
297 297
298 if (!efl_ui_widget_theme_object_set(obj, wd->resize_obj, 298 if (!elm_widget_theme_object_set(obj, wd->resize_obj,
299 elm_widget_theme_klass_get(obj), 299 elm_widget_theme_klass_get(obj),
300 elm_widget_theme_element_get(obj), 300 elm_widget_theme_element_get(obj),
301 elm_widget_theme_style_get(obj))) 301 elm_widget_theme_style_get(obj)))
diff --git a/src/lib/elementary/efl_ui_calendar.c b/src/lib/elementary/efl_ui_calendar.c
index 2f42a7993d..49c325905e 100644
--- a/src/lib/elementary/efl_ui_calendar.c
+++ b/src/lib/elementary/efl_ui_calendar.c
@@ -1002,7 +1002,7 @@ _efl_ui_calendar_constructor_internal(Eo *obj, Efl_Ui_Calendar_Data *priv)
1002 1002
1003 if (!elm_widget_theme_klass_get(obj)) 1003 if (!elm_widget_theme_klass_get(obj))
1004 elm_widget_theme_klass_set(obj, "calendar"); 1004 elm_widget_theme_klass_set(obj, "calendar");
1005 if (!efl_ui_widget_theme_object_set(obj, wd->resize_obj, 1005 if (!elm_widget_theme_object_set(obj, wd->resize_obj,
1006 elm_widget_theme_klass_get(obj), 1006 elm_widget_theme_klass_get(obj),
1007 elm_widget_theme_element_get(obj), 1007 elm_widget_theme_element_get(obj),
1008 elm_widget_theme_style_get(obj))) 1008 elm_widget_theme_style_get(obj)))
diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c
index 15d1f1e173..6ba2b5b2b7 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -828,7 +828,7 @@ _efl_ui_clock_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Clock_Data *priv)
828 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 828 efl_canvas_group_add(efl_super(obj, MY_CLASS));
829 elm_widget_sub_object_parent_add(obj); 829 elm_widget_sub_object_parent_add(obj);
830 830
831 if (!efl_ui_widget_theme_object_set(obj, wd->resize_obj, 831 if (!elm_widget_theme_object_set(obj, wd->resize_obj,
832 elm_widget_theme_klass_get(obj), 832 elm_widget_theme_klass_get(obj),
833 elm_widget_theme_element_get(obj), 833 elm_widget_theme_element_get(obj),
834 elm_widget_theme_style_get(obj))) 834 elm_widget_theme_style_get(obj)))
diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c
index 74e6e9bfb0..234812d928 100644
--- a/src/lib/elementary/efl_ui_frame.c
+++ b/src/lib/elementary/efl_ui_frame.c
@@ -131,7 +131,7 @@ _efl_ui_frame_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UN
131 131
132 elm_widget_can_focus_set(obj, EINA_FALSE); 132 elm_widget_can_focus_set(obj, EINA_FALSE);
133 133
134 if (!efl_ui_widget_theme_object_set(obj, wd->resize_obj, 134 if (!elm_widget_theme_object_set(obj, wd->resize_obj,
135 elm_widget_theme_klass_get(obj), 135 elm_widget_theme_klass_get(obj),
136 elm_widget_theme_element_get(obj), 136 elm_widget_theme_element_get(obj),
137 elm_widget_theme_style_get(obj))) 137 elm_widget_theme_style_get(obj)))
diff --git a/src/lib/elementary/efl_ui_multibuttonentry.c b/src/lib/elementary/efl_ui_multibuttonentry.c
index f4f14f6328..2becad6dda 100644
--- a/src/lib/elementary/efl_ui_multibuttonentry.c
+++ b/src/lib/elementary/efl_ui_multibuttonentry.c
@@ -1563,7 +1563,7 @@ _efl_ui_multibuttonentry_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Multibuttone
1563 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 1563 efl_canvas_group_add(efl_super(obj, MY_CLASS));
1564 elm_widget_sub_object_parent_add(obj); 1564 elm_widget_sub_object_parent_add(obj);
1565 1565
1566 if (!efl_ui_widget_theme_object_set(obj, wd->resize_obj, 1566 if (!elm_widget_theme_object_set(obj, wd->resize_obj,
1567 elm_widget_theme_klass_get(obj), 1567 elm_widget_theme_klass_get(obj),
1568 elm_widget_theme_element_get(obj), 1568 elm_widget_theme_element_get(obj),
1569 elm_widget_theme_style_get(obj))) 1569 elm_widget_theme_style_get(obj)))
diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index 706dbcc603..bf7cb465f1 100644
--- a/src/lib/elementary/efl_ui_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -396,7 +396,7 @@ _efl_ui_panes_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UN
396 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 396 efl_canvas_group_add(efl_super(obj, MY_CLASS));
397 elm_widget_sub_object_parent_add(obj); 397 elm_widget_sub_object_parent_add(obj);
398 398
399 if (!efl_ui_widget_theme_object_set(obj, wd->resize_obj, 399 if (!elm_widget_theme_object_set(obj, wd->resize_obj,
400 elm_widget_theme_klass_get(obj), 400 elm_widget_theme_klass_get(obj),
401 _efl_ui_panes_theme_group_get(obj, sd), 401 _efl_ui_panes_theme_group_get(obj, sd),
402 elm_widget_theme_style_get(obj))) 402 elm_widget_theme_style_get(obj)))
diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index c4754e8e08..3f0683a331 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -361,7 +361,7 @@ _efl_ui_progressbar_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Progressbar_Data
361 priv->dir = EFL_UI_DIR_RIGHT; 361 priv->dir = EFL_UI_DIR_RIGHT;
362 priv->val = MIN_RATIO_LVL; 362 priv->val = MIN_RATIO_LVL;
363 363
364 if (!efl_ui_widget_theme_object_set(obj, wd->resize_obj, 364 if (!elm_widget_theme_object_set(obj, wd->resize_obj,
365 elm_widget_theme_klass_get(obj), 365 elm_widget_theme_klass_get(obj),
366 _efl_ui_progressbar_theme_group_get(obj, priv), 366 _efl_ui_progressbar_theme_group_get(obj, priv),
367 elm_widget_theme_style_get(obj))) 367 elm_widget_theme_style_get(obj)))
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index 8c57e64598..a855757960 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -655,9 +655,9 @@ _popup_update(Evas_Object *obj, Efl_Ui_Slider_Data *sd, Evas_Object *popup)
655 if (elm_widget_is_legacy(obj)) 655 if (elm_widget_is_legacy(obj))
656 { 656 {
657 if (_is_horizontal(sd->dir)) 657 if (_is_horizontal(sd->dir))
658 efl_ui_widget_theme_object_set(obj, popup, "slider", "horizontal/popup", elm_widget_style_get(obj)); 658 elm_widget_theme_object_set(obj, popup, "slider", "horizontal/popup", elm_widget_style_get(obj));
659 else 659 else
660 efl_ui_widget_theme_object_set(obj, popup, "slider", "vertical/popup", elm_widget_style_get(obj)); 660 elm_widget_theme_object_set(obj, popup, "slider", "vertical/popup", elm_widget_style_get(obj));
661 } 661 }
662 else 662 else
663 elm_widget_element_update(obj, popup, PART_NAME_POPUP); 663 elm_widget_element_update(obj, popup, PART_NAME_POPUP);
@@ -1143,7 +1143,7 @@ _efl_ui_slider_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Slider_Data *priv)
1143 priv->wheel_indicator_duration = 0.25; 1143 priv->wheel_indicator_duration = 0.25;
1144 priv->step = SLIDER_STEP; 1144 priv->step = SLIDER_STEP;
1145 1145
1146 if (!efl_ui_widget_theme_object_set(obj, wd->resize_obj, 1146 if (!elm_widget_theme_object_set(obj, wd->resize_obj,
1147 elm_widget_theme_klass_get(obj), 1147 elm_widget_theme_klass_get(obj),
1148 _efl_ui_slider_theme_group_get(obj, priv), 1148 _efl_ui_slider_theme_group_get(obj, priv),
1149 elm_widget_theme_style_get(obj))) 1149 elm_widget_theme_style_get(obj)))
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index ce02cd139a..434a4fda6f 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -3011,7 +3011,7 @@ _efl_ui_text_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Text_Data *priv)
3011 3011
3012 if (!elm_widget_theme_klass_get(obj)) 3012 if (!elm_widget_theme_klass_get(obj))
3013 elm_widget_theme_klass_set(obj, "text"); 3013 elm_widget_theme_klass_set(obj, "text");
3014 if (!efl_ui_widget_theme_object_set(obj, wd->resize_obj, 3014 if (!elm_widget_theme_object_set(obj, wd->resize_obj,
3015 elm_widget_theme_klass_get(obj), 3015 elm_widget_theme_klass_get(obj),
3016 _efl_ui_text_theme_group_get(obj), 3016 _efl_ui_text_theme_group_get(obj),
3017 elm_widget_theme_style_get(obj))) 3017 elm_widget_theme_style_get(obj)))
diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c
index 70db16e720..9046777b07 100644
--- a/src/lib/elementary/efl_ui_video.c
+++ b/src/lib/elementary/efl_ui_video.c
@@ -232,7 +232,7 @@ _efl_ui_video_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Video_Data *priv)
232 if (!emotion_object_init(priv->emotion, NULL)) 232 if (!emotion_object_init(priv->emotion, NULL))
233 CRI("Failed to init emotion object"); 233 CRI("Failed to init emotion object");
234 234
235 if (!efl_ui_widget_theme_object_set(obj, wd->resize_obj, 235 if (!elm_widget_theme_object_set(obj, wd->resize_obj,
236 elm_widget_theme_klass_get(obj), 236 elm_widget_theme_klass_get(obj),
237 elm_widget_theme_element_get(obj), 237 elm_widget_theme_element_get(obj),
238 elm_widget_theme_style_get(obj))) 238 elm_widget_theme_style_get(obj)))
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 0c9ce584df..f608b75ffd 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -1170,7 +1170,7 @@ _elm_win_focus_highlight_reconfigure_job(void *data)
1170 else 1170 else
1171 str = "default"; 1171 str = "default";
1172 1172
1173 efl_ui_widget_theme_object_set 1173 elm_widget_theme_object_set
1174 (sd->obj, fobj, "focus_highlight", "top", str); 1174 (sd->obj, fobj, "focus_highlight", "top", str);
1175 sd->focus_highlight.theme_changed = EINA_FALSE; 1175 sd->focus_highlight.theme_changed = EINA_FALSE;
1176 1176
@@ -3153,15 +3153,15 @@ _elm_win_wl_cursor_set(Evas_Object *obj, const char *cursor)
3153 3153
3154 if (cursor) 3154 if (cursor)
3155 { 3155 {
3156 if (!efl_ui_widget_theme_object_set(sd->obj, sd->pointer.obj, 3156 if (!elm_widget_theme_object_set(sd->obj, sd->pointer.obj,
3157 "cursor", cursor, "default")) 3157 "cursor", cursor, "default"))
3158 { 3158 {
3159 efl_ui_widget_theme_object_set(sd->obj, sd->pointer.obj, 3159 elm_widget_theme_object_set(sd->obj, sd->pointer.obj,
3160 "pointer", "base", "default"); 3160 "pointer", "base", "default");
3161 } 3161 }
3162 } 3162 }
3163 else 3163 else
3164 efl_ui_widget_theme_object_set(sd->obj, sd->pointer.obj, 3164 elm_widget_theme_object_set(sd->obj, sd->pointer.obj,
3165 "pointer", "base", "default"); 3165 "pointer", "base", "default");
3166 3166
3167 edje_object_size_min_get(sd->pointer.obj, &mw, &mh); 3167 edje_object_size_min_get(sd->pointer.obj, &mw, &mh);
@@ -3976,7 +3976,7 @@ _elm_win_frame_cb_resize_show(void *data,
3976 { 3976 {
3977 Efl_Ui_Win_Move_Resize_Mode mode = _move_resize_mode_get(source); 3977 Efl_Ui_Win_Move_Resize_Mode mode = _move_resize_mode_get(source);
3978 const resize_info *ri = _resize_info_get(sd->rot, mode); 3978 const resize_info *ri = _resize_info_get(sd->rot, mode);
3979 if (ri) efl_ui_widget_theme_object_set(sd->obj, sd->pointer.obj, "pointer", "base", ri->cursor); 3979 if (ri) elm_widget_theme_object_set(sd->obj, sd->pointer.obj, "pointer", "base", ri->cursor);
3980 } 3980 }
3981#else 3981#else
3982 (void)source; 3982 (void)source;
@@ -3996,7 +3996,7 @@ _elm_win_frame_cb_resize_hide(void *data,
3996 3996
3997#ifdef HAVE_ELEMENTARY_WL2 3997#ifdef HAVE_ELEMENTARY_WL2
3998 if (sd->pointer.obj) 3998 if (sd->pointer.obj)
3999 efl_ui_widget_theme_object_set(sd->obj, sd->pointer.obj, 3999 elm_widget_theme_object_set(sd->obj, sd->pointer.obj,
4000 "pointer", "base", "default"); 4000 "pointer", "base", "default");
4001#endif 4001#endif
4002} 4002}
@@ -4288,7 +4288,7 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style)
4288 v = version ? atoi(version) : 0; 4288 v = version ? atoi(version) : 0;
4289 if (EINA_LIKELY(v >= FRAME_OBJ_THEME_MIN_VERSION)) 4289 if (EINA_LIKELY(v >= FRAME_OBJ_THEME_MIN_VERSION))
4290 { 4290 {
4291 if (!efl_ui_widget_theme_object_set 4291 if (!elm_widget_theme_object_set
4292 (sd->obj, sd->frame_obj, "border", element, style)) 4292 (sd->obj, sd->frame_obj, "border", element, style))
4293 { 4293 {
4294 ERR("Failed to set main border theme for the window."); 4294 ERR("Failed to set main border theme for the window.");
@@ -5241,7 +5241,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U
5241 Evas_Coord mw = 1, mh = 1, hx = 0, hy = 0; 5241 Evas_Coord mw = 1, mh = 1, hx = 0, hy = 0;
5242 5242
5243 sd->pointer.obj = o = edje_object_add(ecore_evas_get(tmp_sd.ee)); 5243 sd->pointer.obj = o = edje_object_add(ecore_evas_get(tmp_sd.ee));
5244 efl_ui_widget_theme_object_set(obj, o, "pointer", "base", "default"); 5244 elm_widget_theme_object_set(obj, o, "pointer", "base", "default");
5245 edje_object_size_min_calc(o, &mw, &mh); 5245 edje_object_size_min_calc(o, &mw, &mh);
5246 evas_object_resize(o, mw, mh); 5246 evas_object_resize(o, mw, mh);
5247 edje_object_part_geometry_get(o, "elm.swallow.hotspot", 5247 edje_object_part_geometry_get(o, "elm.swallow.hotspot",
@@ -6518,7 +6518,7 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
6518 Eina_Bool ret = EINA_FALSE, prev_alpha; 6518 Eina_Bool ret = EINA_FALSE, prev_alpha;
6519 const char *s; 6519 const char *s;
6520 6520
6521 int_ret = efl_ui_widget_theme_object_set(obj, sd->legacy.edje, "win", "base", 6521 int_ret = elm_widget_theme_object_set(obj, sd->legacy.edje, "win", "base",
6522 elm_widget_style_get(obj)); 6522 elm_widget_style_get(obj));
6523 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 6523 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
6524 6524
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 45163c806e..317e631625 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -2661,9 +2661,10 @@ _elm_widget_efl_gfx_scale_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
2661 return sd->scale; 2661 return sd->scale;
2662} 2662}
2663 2663
2664EOLIAN static void 2664EAPI void
2665_elm_widget_theme_set(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Theme *th) 2665elm_widget_theme_set(Evas_Object *obj, Elm_Theme *th)
2666{ 2666{
2667 ELM_WIDGET_DATA_GET_OR_RETURN(obj, sd);
2667 Eina_Bool apply = EINA_FALSE; 2668 Eina_Bool apply = EINA_FALSE;
2668 if (sd->theme != th) 2669 if (sd->theme != th)
2669 { 2670 {
@@ -2675,13 +2676,6 @@ _elm_widget_theme_set(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Theme *th)
2675 } 2676 }
2676} 2677}
2677 2678
2678/* beta in eo */
2679EAPI void
2680elm_widget_theme_set(Evas_Object *obj, Elm_Theme *th)
2681{
2682 efl_ui_widget_theme_set(obj, th);
2683}
2684
2685EAPI void 2679EAPI void
2686elm_widget_part_text_set(Eo *obj, const char *part, const char *label) 2680elm_widget_part_text_set(Eo *obj, const char *part, const char *label)
2687{ 2681{
@@ -2883,9 +2877,11 @@ _elm_widget_access_info_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
2883 return sd->access_info; 2877 return sd->access_info;
2884} 2878}
2885 2879
2886EOLIAN static Elm_Theme* 2880EAPI Elm_Theme *
2887_elm_widget_theme_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) 2881elm_widget_theme_get(const Evas_Object *obj)
2888{ 2882{
2883 ELM_WIDGET_DATA_GET_OR_RETURN(obj, sd, NULL);
2884
2889 if (!sd->theme) 2885 if (!sd->theme)
2890 { 2886 {
2891 if (sd->parent_obj && elm_widget_is(sd->parent_obj)) 2887 if (sd->parent_obj && elm_widget_is(sd->parent_obj))
@@ -2895,13 +2891,6 @@ _elm_widget_theme_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
2895 return sd->theme; 2891 return sd->theme;
2896} 2892}
2897 2893
2898/* beta in eo */
2899EAPI Elm_Theme *
2900elm_widget_theme_get(const Evas_Object *obj)
2901{
2902 return efl_ui_widget_theme_get(obj);
2903}
2904
2905EOLIAN static Efl_Ui_Theme_Apply 2894EOLIAN static Efl_Ui_Theme_Apply
2906_elm_widget_style_set(Eo *obj, Elm_Widget_Smart_Data *sd, const char *style) 2895_elm_widget_style_set(Eo *obj, Elm_Widget_Smart_Data *sd, const char *style)
2907{ 2896{
@@ -3013,9 +3002,11 @@ elm_widget_scroll_child_locked_y_get(const Eo *obj)
3013 return sd->child_drag_y_locked; 3002 return sd->child_drag_y_locked;
3014} 3003}
3015 3004
3016EOLIAN static Efl_Ui_Theme_Apply 3005EAPI Efl_Ui_Theme_Apply
3017_elm_widget_theme_object_set(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle) 3006elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle)
3018{ 3007{
3008 ELM_WIDGET_DATA_GET_OR_RETURN(obj, sd, EFL_UI_THEME_APPLY_FAILED);
3009
3019 if (eina_streq(welement, "base")) 3010 if (eina_streq(welement, "base"))
3020 welement = NULL; 3011 welement = NULL;
3021 if (eina_streq(wstyle, "default")) 3012 if (eina_streq(wstyle, "default"))
@@ -3036,13 +3027,6 @@ _elm_widget_theme_object_set(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *ed
3036 return ret; 3027 return ret;
3037} 3028}
3038 3029
3039/* beta in eo */
3040EAPI Efl_Ui_Theme_Apply
3041elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle)
3042{
3043 return efl_ui_widget_theme_object_set(obj, edj, wname, welement, wstyle);
3044}
3045
3046static void 3030static void
3047_convert(Efl_Dbg_Info *info, Eina_Iterator *ptr_list) 3031_convert(Efl_Dbg_Info *info, Eina_Iterator *ptr_list)
3048{ 3032{
@@ -3702,7 +3686,7 @@ elm_widget_element_update(Evas_Object *obj, Evas_Object *component, const char *
3702 } 3686 }
3703 else 3687 else
3704 { 3688 {
3705 ret = efl_ui_widget_theme_object_set(obj, component, 3689 ret = elm_widget_theme_object_set(obj, component,
3706 elm_widget_theme_klass_get(obj), 3690 elm_widget_theme_klass_get(obj),
3707 (const char *)group, 3691 (const char *)group,
3708 elm_widget_theme_style_get(obj)); 3692 elm_widget_theme_style_get(obj));
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index 29912a3e11..6164374f82 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -202,26 +202,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access,
202 } 202 }
203 } 203 }
204 204
205 /* Theme API: Not bound to EO */
206 @property theme @beta {
207 [[Widget theme]]
208 values {
209 th: ptr(Elm.Theme) @nullable; [[Elementary theme]]
210 }
211 }
212 @property theme_object @beta {
213 [[Theme object property]]
214 set {
215 return: Efl.Ui.Theme.Apply; [[Theme apply]]
216 }
217 values {
218 edj: Efl.Canvas.Object; [[Edje object]]
219 wname: string; [[Widget name]]
220 welement: string; [[Widget element]]
221 wstyle: string; [[Widget style]]
222 }
223 }
224
225 /* Accessibility */ 205 /* Accessibility */
226 @property access_info { 206 @property access_info {
227 [[Accessibility information. 207 [[Accessibility information.
diff --git a/src/lib/elementary/els_cursor.c b/src/lib/elementary/els_cursor.c
index 9f1a371799..69d541835e 100644
--- a/src/lib/elementary/els_cursor.c
+++ b/src/lib/elementary/els_cursor.c
@@ -270,7 +270,7 @@ _elm_cursor_obj_add(Evas_Object *obj, Elm_Cursor *cur)
270 cur->obj = edje_object_add(cur->evas); 270 cur->obj = edje_object_add(cur->evas);
271 if (!cur->obj) return EINA_FALSE; 271 if (!cur->obj) return EINA_FALSE;
272 272
273 if (!efl_ui_widget_theme_object_set(obj, cur->obj, "cursor", cur->cursor_name, 273 if (!elm_widget_theme_object_set(obj, cur->obj, "cursor", cur->cursor_name,
274 cur->style ? cur->style : "default")) 274 cur->style ? cur->style : "default"))
275 { 275 {
276 ELM_SAFE_FREE(cur->obj, evas_object_del); 276 ELM_SAFE_FREE(cur->obj, evas_object_del);
@@ -740,7 +740,7 @@ _elm_widget_efl_ui_cursor_cursor_style_set(Evas_Object *obj, Elm_Widget_Smart_Da
740 } 740 }
741 else 741 else
742 { 742 {
743 if (!efl_ui_widget_theme_object_set(obj, cur->obj, "cursor", cur->cursor_name, 743 if (!elm_widget_theme_object_set(obj, cur->obj, "cursor", cur->cursor_name,
744 style)) 744 style))
745 { 745 {
746 ERR("Could not apply the theme to the cursor style=%s", style); 746 ERR("Could not apply the theme to the cursor style=%s", style);
@@ -768,7 +768,7 @@ void
768elm_cursor_theme(Elm_Cursor *cur) 768elm_cursor_theme(Elm_Cursor *cur)
769{ 769{
770 if ((!cur) || (!cur->obj)) return; 770 if ((!cur) || (!cur->obj)) return;
771 if (!efl_ui_widget_theme_object_set(cur->owner, cur->obj, "cursor", 771 if (!elm_widget_theme_object_set(cur->owner, cur->obj, "cursor",
772 cur->cursor_name, cur->style)) 772 cur->cursor_name, cur->style))
773 ERR("Could not apply the theme to the cursor style=%s", cur->style); 773 ERR("Could not apply the theme to the cursor style=%s", cur->style);
774 else 774 else