summaryrefslogtreecommitdiff
path: root/src/lib/elementary/efl_ui_progressbar.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/elementary/efl_ui_progressbar.c')
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c27
1 files changed, 13 insertions, 14 deletions
diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index ccaaf7e..56ed183 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -232,11 +232,11 @@ _efl_ui_progressbar_theme_group_get(Evas_Object *obj, Efl_Ui_Progressbar_Data *s
232 return eina_strbuf_release(new_group); 232 return eina_strbuf_release(new_group);
233} 233}
234 234
235EOLIAN static Efl_Ui_Theme_Apply_Result 235EOLIAN static Eina_Error
236_efl_ui_progressbar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *sd) 236_efl_ui_progressbar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *sd)
237{ 237{
238 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 238 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
239 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 239 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
240 char *group; 240 char *group;
241 241
242 group = _efl_ui_progressbar_theme_group_get(obj, sd); 242 group = _efl_ui_progressbar_theme_group_get(obj, sd);
@@ -247,7 +247,7 @@ _efl_ui_progressbar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *
247 } 247 }
248 248
249 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 249 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
250 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 250 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
251 251
252 if (elm_widget_is_legacy(obj)) 252 if (elm_widget_is_legacy(obj))
253 { 253 {
@@ -366,11 +366,10 @@ _efl_ui_progressbar_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Progressbar_Data
366 priv->val_max = 1.0; 366 priv->val_max = 1.0;
367 group = _efl_ui_progressbar_theme_group_get(obj, priv); 367 group = _efl_ui_progressbar_theme_group_get(obj, priv);
368 368
369 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 369 if (elm_widget_theme_object_set(obj, wd->resize_obj,
370 elm_widget_theme_klass_get(obj), 370 elm_widget_theme_klass_get(obj),
371 group, 371 group,
372 elm_widget_theme_style_get(obj))) 372 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
373 CRI("Failed to set layout!");
374 373
375 free(group); 374 free(group);
376 375
@@ -780,7 +779,7 @@ ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(efl_ui_progressbar)
780 779
781#include "efl_ui_progressbar.eo.c" 780#include "efl_ui_progressbar.eo.c"
782 781
783#include "efl_ui_progressbar_legacy.eo.h" 782#include "efl_ui_progressbar_legacy_eo.h"
784#include "efl_ui_progressbar_legacy_part.eo.h" 783#include "efl_ui_progressbar_legacy_part.eo.h"
785 784
786#define MY_CLASS_NAME_LEGACY "elm_progressbar" 785#define MY_CLASS_NAME_LEGACY "elm_progressbar"
@@ -820,13 +819,13 @@ _icon_signal_emit(Evas_Object *obj)
820/* FIXME: replicated from elm_layout just because progressbar's icon spot 819/* FIXME: replicated from elm_layout just because progressbar's icon spot
821 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we 820 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
822 * can changed the theme API */ 821 * can changed the theme API */
823EOLIAN static Efl_Ui_Theme_Apply_Result 822EOLIAN static Eina_Error
824_efl_ui_progressbar_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED) 823_efl_ui_progressbar_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED)
825{ 824{
826 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 825 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
827 826
828 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_PROGRESSBAR_LEGACY_CLASS)); 827 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_PROGRESSBAR_LEGACY_CLASS));
829 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 828 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
830 _icon_signal_emit(obj); 829 _icon_signal_emit(obj);
831 830
832 return int_ret; 831 return int_ret;
@@ -1050,4 +1049,4 @@ elm_progressbar_value_get(const Evas_Object *obj)
1050 return efl_ui_range_value_get(obj); 1049 return efl_ui_range_value_get(obj);
1051} 1050}
1052 1051
1053#include "efl_ui_progressbar_legacy.eo.c" 1052#include "efl_ui_progressbar_legacy_eo.c"