summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinwoo Kim <cinoo.kim@samsung.com>2019-07-11 10:33:55 +0000
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-07-11 13:19:54 +0200
commita3a07f6e83eaf8760d3718d0d8a5af424554d461 (patch)
tree86aa8e0eb1dabb25a2499ee0c8cfce8fe6161055
parentfa333608b78eefa836b858eca6fbd9718521d143 (diff)
Efl.Ui.Format: fix regressions
(1) Following commit did not care of efl_ui_format_string_get(set) of elm_slider_part_indicator_eo.c e776f5f Efl.Ui.Format revamp Even though you call elm_slider_indicator_format_set with "%1.0f", elm_slider_indicator_format_get returns NULL. (2) The commit does not initialize format variables - elm_slider_indicator_format_get - elm_slider_unit_format_get - elm_progressbar_unit_format_get Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D9276
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c2
-rw-r--r--src/lib/elementary/elm_slider.c12
-rw-r--r--src/lib/elementary/elm_slider_part_indicator_eo.c6
3 files changed, 9 insertions, 11 deletions
diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index 522166f..19b49bf 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -1053,7 +1053,7 @@ elm_progressbar_unit_format_set(Evas_Object *obj, const char *units)
1053EAPI const char * 1053EAPI const char *
1054elm_progressbar_unit_format_get(const Evas_Object *obj) 1054elm_progressbar_unit_format_get(const Evas_Object *obj)
1055{ 1055{
1056 const char *fmt; 1056 const char *fmt = NULL;
1057 efl_ui_format_string_get(obj, &fmt, NULL); 1057 efl_ui_format_string_get(obj, &fmt, NULL);
1058 return fmt; 1058 return fmt;
1059} 1059}
diff --git a/src/lib/elementary/elm_slider.c b/src/lib/elementary/elm_slider.c
index 8239e47..a603894 100644
--- a/src/lib/elementary/elm_slider.c
+++ b/src/lib/elementary/elm_slider.c
@@ -1124,7 +1124,7 @@ _indi_default_format_free_cb(void *data)
1124} 1124}
1125 1125
1126EOLIAN static void 1126EOLIAN static void
1127_elm_slider_part_indicator_efl_ui_format_format_string_set(Eo *obj, void *_pd EINA_UNUSED, const char *template) 1127_elm_slider_part_indicator_efl_ui_format_format_string_set(Eo *obj, void *_pd EINA_UNUSED, const char *template, Efl_Ui_Format_String_Type type EINA_UNUSED)
1128{ 1128{
1129 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 1129 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
1130 Elm_Slider_Data *sd = efl_data_scope_get(pd->obj, ELM_SLIDER_CLASS); 1130 Elm_Slider_Data *sd = efl_data_scope_get(pd->obj, ELM_SLIDER_CLASS);
@@ -1135,13 +1135,13 @@ _elm_slider_part_indicator_efl_ui_format_format_string_set(Eo *obj, void *_pd EI
1135 efl_ui_format_func_set(efl_part(pd->obj, "indicator"), pd->obj, _indi_default_format_cb, _indi_default_format_free_cb); 1135 efl_ui_format_func_set(efl_part(pd->obj, "indicator"), pd->obj, _indi_default_format_cb, _indi_default_format_free_cb);
1136} 1136}
1137 1137
1138EOLIAN static const char * 1138EOLIAN static void
1139_elm_slider_part_indicator_efl_ui_format_format_string_get(const Eo *obj, void *_pd EINA_UNUSED) 1139_elm_slider_part_indicator_efl_ui_format_format_string_get(const Eo *obj, void *_pd EINA_UNUSED, const char **template, Efl_Ui_Format_String_Type *type EINA_UNUSED)
1140{ 1140{
1141 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 1141 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
1142 Elm_Slider_Data *sd = efl_data_scope_get(pd->obj, ELM_SLIDER_CLASS); 1142 Elm_Slider_Data *sd = efl_data_scope_get(pd->obj, ELM_SLIDER_CLASS);
1143 1143
1144 return sd->indi_template; 1144 if (template) *template = sd->indi_template;
1145} 1145}
1146 1146
1147EOLIAN static void 1147EOLIAN static void
@@ -1207,7 +1207,7 @@ elm_slider_unit_format_set(Evas_Object *obj, const char *units)
1207EAPI const char * 1207EAPI const char *
1208elm_slider_unit_format_get(const Evas_Object *obj) 1208elm_slider_unit_format_get(const Evas_Object *obj)
1209{ 1209{
1210 const char* fmt; 1210 const char* fmt = NULL;
1211 efl_ui_format_string_get(obj, &fmt, NULL); 1211 efl_ui_format_string_get(obj, &fmt, NULL);
1212 return fmt; 1212 return fmt;
1213} 1213}
@@ -1386,7 +1386,7 @@ elm_slider_indicator_format_set(Evas_Object *obj, const char *indicator)
1386EAPI const char * 1386EAPI const char *
1387elm_slider_indicator_format_get(const Evas *obj) 1387elm_slider_indicator_format_get(const Evas *obj)
1388{ 1388{
1389 const char *fmt; 1389 const char *fmt = NULL;
1390 efl_ui_format_string_get(efl_part(obj, "indicator"), &fmt, NULL); 1390 efl_ui_format_string_get(efl_part(obj, "indicator"), &fmt, NULL);
1391 return fmt; 1391 return fmt;
1392} 1392}
diff --git a/src/lib/elementary/elm_slider_part_indicator_eo.c b/src/lib/elementary/elm_slider_part_indicator_eo.c
index 5488294..369285b 100644
--- a/src/lib/elementary/elm_slider_part_indicator_eo.c
+++ b/src/lib/elementary/elm_slider_part_indicator_eo.c
@@ -9,11 +9,9 @@ EOAPI EFL_FUNC_BODY_CONST(elm_slider_part_indicator_visible_mode_get, Elm_Slider
9 9
10void _elm_slider_part_indicator_efl_ui_format_format_cb_set(Eo *obj, void *pd, void *func_data, Efl_Ui_Format_Func func, Eina_Free_Cb func_free_cb); 10void _elm_slider_part_indicator_efl_ui_format_format_cb_set(Eo *obj, void *pd, void *func_data, Efl_Ui_Format_Func func, Eina_Free_Cb func_free_cb);
11 11
12void _elm_slider_part_indicator_efl_ui_format_format_string_set(Eo *obj, void *_pd, const char *template, Efl_Ui_Format_String_Type type);
12 13
13void _elm_slider_part_indicator_efl_ui_format_format_string_set(Eo *obj, void *pd, const char *units); 14void _elm_slider_part_indicator_efl_ui_format_format_string_get (const Eo *obj, void *_pd, const char **template, Efl_Ui_Format_String_Type *type);
14
15
16const char *_elm_slider_part_indicator_efl_ui_format_format_string_get(const Eo *obj, void *pd);
17 15
18void _elm_slider_part_indicator_efl_ui_format_apply_formatted_value(Eo *obj, Elm_Part_Data *pd); 16void _elm_slider_part_indicator_efl_ui_format_apply_formatted_value(Eo *obj, Elm_Part_Data *pd);
19 17