summaryrefslogtreecommitdiff
path: root/src/lib/elementary/efl_ui_spin_button.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-04 13:36:41 -0500
committerMike Blumenkrantz <zmike@samsung.com>2019-03-04 13:36:41 -0500
commit644b771fe43ad76a70de8f6e1a07ca9159c3458c (patch)
tree0640b7519233d4691ae0b43ee29470da97e1c327 /src/lib/elementary/efl_ui_spin_button.c
parent2f007f7a08b680988c6a4728f2809facebec6f79 (diff)
efl.ui: Efl.Ui.Theme_Apply_Result -> Efl.Ui.Theme_Apply_Error
Summary: this swaps the values of "no error" and "error" in order to maintain consistency with the rest of efl where the zero value means "no error" Depends on D8060 Reviewers: cedric Reviewed By: cedric Subscribers: segfaultxavi, cedric, #reviewers, #committers Tags: #efl_api Differential Revision: https://phab.enlightenment.org/D8063
Diffstat (limited to 'src/lib/elementary/efl_ui_spin_button.c')
-rw-r--r--src/lib/elementary/efl_ui_spin_button.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c
index 3442de9..8a26509 100644
--- a/src/lib/elementary/efl_ui_spin_button.c
+++ b/src/lib/elementary/efl_ui_spin_button.c
@@ -788,10 +788,10 @@ _efl_ui_spin_button_theme_group_get(Evas_Object *obj, Efl_Ui_Spin_Button_Data *s
788} 788}
789 789
790 790
791EOLIAN static Efl_Ui_Theme_Apply_Result 791EOLIAN static Efl_Ui_Theme_Apply_Error
792_efl_ui_spin_button_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED) 792_efl_ui_spin_button_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED)
793{ 793{
794 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 794 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
795 char *group; 795 char *group;
796 796
797 group = _efl_ui_spin_button_theme_group_get(obj, sd); 797 group = _efl_ui_spin_button_theme_group_get(obj, sd);
@@ -802,7 +802,7 @@ _efl_ui_spin_button_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Spin_Button_Data *
802 } 802 }
803 803
804 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 804 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
805 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 805 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
806 806
807 if (sd->ent) 807 if (sd->ent)
808 elm_widget_element_update(obj, sd->ent, PART_NAME_ENTRY); 808 elm_widget_element_update(obj, sd->ent, PART_NAME_ENTRY);
@@ -821,7 +821,7 @@ _efl_ui_spin_button_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Spin_Button_Data *
821 821
822 _label_write(obj); 822 _label_write(obj);
823 elm_layout_sizing_eval(obj); 823 elm_layout_sizing_eval(obj);
824 return EFL_UI_THEME_APPLY_RESULT_SUCCESS; 824 return EFL_UI_THEME_APPLY_ERROR_NONE;
825} 825}
826 826
827EOLIAN static Eo * 827EOLIAN static Eo *
@@ -836,12 +836,13 @@ _efl_ui_spin_button_efl_object_constructor(Eo *obj, Efl_Ui_Spin_Button_Data *sd)
836 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 836 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
837 837
838 group = _efl_ui_spin_button_theme_group_get(obj, sd); 838 group = _efl_ui_spin_button_theme_group_get(obj, sd);
839 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 839 if (elm_widget_theme_object_set(obj, wd->resize_obj,
840 elm_widget_theme_klass_get(obj), 840 elm_widget_theme_klass_get(obj),
841 group, 841 group,
842 elm_widget_theme_style_get(obj))) 842 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
843 CRI("Failed to set layout!"); 843 CRI("Failed to set layout!");
844 844
845
845 free(group); 846 free(group);
846 847
847 sd->first_interval = 0.85; 848 sd->first_interval = 0.85;