From 969c7f72877c3cd67fcbaf947d9873bf442402de Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 19 Jun 2019 09:55:51 +0200 Subject: efl_ui_range_display: range_min_max -> range_limits Summary: ref T7895 Reviewers: segfaultxavi Reviewed By: segfaultxavi Subscribers: cedric, #reviewers, #committers Tags: #efl_api Maniphest Tasks: T7895 Differential Revision: https://phab.enlightenment.org/D9110 --- src/bin/elementary/test_flipselector.c | 2 +- src/bin/elementary/test_ui_active_view.c | 14 +++++++------- src/bin/elementary/test_ui_pager.c | 14 +++++++------- src/bin/elementary/test_ui_pager_scroll.c | 18 +++++++++--------- src/bin/elementary/test_ui_progressbar.c | 4 ++-- src/bin/elementary/test_ui_relative_layout.c | 6 +++--- src/bin/elementary/test_ui_slider.c | 10 +++++----- src/bin/elementary/test_ui_slider_interval.c | 8 ++++---- src/bin/elementary/test_ui_spin.c | 2 +- src/bin/elementary/test_ui_spin_button.c | 6 +++--- src/bin/elementary/test_ui_tab_pager.c | 10 +++++----- src/examples/elementary/efl_ui_list_example_1.c | 2 +- src/examples/elementary/slider_cxx_example.cc | 6 +++--- src/lib/efl/interfaces/efl_ui_range_display.eo | 2 +- src/lib/elementary/efl_ui_datepicker.c | 8 ++++---- src/lib/elementary/efl_ui_progressbar.c | 12 ++++++------ src/lib/elementary/efl_ui_progressbar.eo | 2 +- src/lib/elementary/efl_ui_progressbar_part.eo | 2 +- src/lib/elementary/efl_ui_slider.c | 4 ++-- src/lib/elementary/efl_ui_slider.eo | 2 +- src/lib/elementary/efl_ui_spin.c | 4 ++-- src/lib/elementary/efl_ui_spin.eo | 2 +- src/lib/elementary/efl_ui_timepicker.c | 4 ++-- src/lib/elementary/elm_flipselector.c | 4 ++-- src/lib/elementary/elm_flipselector_eo.c | 8 ++++---- src/lib/elementary/elm_slider.c | 4 ++-- src/lib/elementary/elm_spinner.c | 8 ++++---- src/lib/elementary/elm_spinner_eo.c | 8 ++++---- 28 files changed, 88 insertions(+), 88 deletions(-) diff --git a/src/bin/elementary/test_flipselector.c b/src/bin/elementary/test_flipselector.c index 13216bdc80..bd306b07cd 100644 --- a/src/bin/elementary/test_flipselector.c +++ b/src/bin/elementary/test_flipselector.c @@ -187,7 +187,7 @@ test_flipselector(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev fpd = elm_flipselector_add(bx); evas_object_size_hint_weight_set(fpd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); efl_ui_range_step_set(fpd, 1.5); - efl_ui_range_min_max_set(fpd, 2.3, 10.1); + efl_ui_range_limits_set(fpd, 2.3, 10.1); efl_ui_range_value_set(fpd, 5.3); printf("Current value is %f\n", efl_ui_range_value_get(fpd)); elm_box_pack_end(bx, fpd); diff --git a/src/bin/elementary/test_ui_active_view.c b/src/bin/elementary/test_ui_active_view.c index 8f0d21febb..86e81e8015 100644 --- a/src/bin/elementary/test_ui_active_view.c +++ b/src/bin/elementary/test_ui_active_view.c @@ -292,7 +292,7 @@ pack_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED) index = efl_ui_range_value_get(param->pack_sp); if (index > cnt) efl_ui_range_value_set(param->pack_sp, cnt); - efl_ui_range_min_max_set(param->pack_sp, 0, cnt); + efl_ui_range_limits_set(param->pack_sp, 0, cnt); if (cnt > 0) { @@ -303,7 +303,7 @@ pack_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED) index = efl_ui_range_value_get(param->unpack_sp); if (index > cnt) efl_ui_range_value_set(param->unpack_sp, cnt); - efl_ui_range_min_max_set(param->unpack_sp, 0, cnt); + efl_ui_range_limits_set(param->unpack_sp, 0, cnt); } else { @@ -385,7 +385,7 @@ active_view_size(void *data, efl_gfx_entity_visible_set(ck, 1); sl = efl_add(EFL_UI_SLIDER_CLASS, inbox, - efl_ui_range_min_max_set(efl_added, 100, 200), + efl_ui_range_limits_set(efl_added, 100, 200), efl_ui_range_value_set(efl_added, params->w), efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, @@ -426,7 +426,7 @@ active_view_size(void *data, efl_gfx_entity_visible_set(ck, 1); sl = efl_add(EFL_UI_SLIDER_CLASS, inbox, - efl_ui_range_min_max_set(efl_added, 100, 300), + efl_ui_range_limits_set(efl_added, 100, 300), efl_ui_range_value_set(efl_added, params->h), efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, @@ -511,7 +511,7 @@ pack_cb(void *data, efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)); sp1 = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box1, - efl_ui_range_min_max_set(efl_added, 0, + efl_ui_range_limits_set(efl_added, 0, efl_content_count(active_view)), efl_ui_range_value_set(efl_added, efl_ui_active_view_active_index_get(active_view))); @@ -635,7 +635,7 @@ pack_cb(void *data, if (efl_content_count(active_view) > 0) { - efl_ui_range_min_max_set(sp2, 0, + efl_ui_range_limits_set(sp2, 0, (efl_content_count(active_view) - 1)); efl_ui_range_value_set(sp2, efl_ui_active_view_active_index_get(active_view)); @@ -701,7 +701,7 @@ active_index_cb(void *data, if (efl_content_count(active_view) > 0) { - efl_ui_range_min_max_set(sp, 0, + efl_ui_range_limits_set(sp, 0, (efl_content_count(active_view) - 1)); efl_ui_range_value_set(sp, efl_ui_active_view_active_index_get(active_view)); diff --git a/src/bin/elementary/test_ui_pager.c b/src/bin/elementary/test_ui_pager.c index 30c05af08d..5fba212e53 100644 --- a/src/bin/elementary/test_ui_pager.c +++ b/src/bin/elementary/test_ui_pager.c @@ -274,7 +274,7 @@ static void pack_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED) index = efl_ui_range_value_get(param->pack_sp); if (index > cnt) efl_ui_range_value_set(param->pack_sp, cnt); - efl_ui_range_min_max_set(param->pack_sp, 0, cnt); + efl_ui_range_limits_set(param->pack_sp, 0, cnt); if (cnt > 0) { @@ -285,7 +285,7 @@ static void pack_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED) index = efl_ui_range_value_get(param->unpack_sp); if (index > cnt) efl_ui_range_value_set(param->unpack_sp, cnt); - efl_ui_range_min_max_set(param->unpack_sp, 0, cnt); + efl_ui_range_limits_set(param->unpack_sp, 0, cnt); } else { @@ -361,7 +361,7 @@ static void page_size_cb(void *data, efl_gfx_entity_visible_set(ck, 1); sl = efl_add(EFL_UI_SLIDER_CLASS, inbox, - efl_ui_range_min_max_set(efl_added, 100, 200), + efl_ui_range_limits_set(efl_added, 100, 200), efl_ui_range_value_set(efl_added, params->w), efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, @@ -402,7 +402,7 @@ static void page_size_cb(void *data, efl_gfx_entity_visible_set(ck, 1); sl = efl_add(EFL_UI_SLIDER_CLASS, inbox, - efl_ui_range_min_max_set(efl_added, 100, 300), + efl_ui_range_limits_set(efl_added, 100, 300), efl_ui_range_value_set(efl_added, params->h), efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, @@ -452,7 +452,7 @@ static void pack_cb(void *data, efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)); sp1 = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box1, - efl_ui_range_min_max_set(efl_added, 0, + efl_ui_range_limits_set(efl_added, 0, efl_content_count(pager)), efl_ui_range_value_set(efl_added, efl_ui_pager_current_page_get(pager))); @@ -576,7 +576,7 @@ static void pack_cb(void *data, if (efl_content_count(pager) > 0) { - efl_ui_range_min_max_set(sp2, 0, + efl_ui_range_limits_set(sp2, 0, (efl_content_count(pager) - 1)); efl_ui_range_value_set(sp2, efl_ui_pager_current_page_get(pager)); @@ -642,7 +642,7 @@ static void current_page_cb(void *data, if (efl_content_count(pager) > 0) { - efl_ui_range_min_max_set(sp, 0, + efl_ui_range_limits_set(sp, 0, (efl_content_count(pager) - 1)); efl_ui_range_value_set(sp, efl_ui_pager_current_page_get(pager)); diff --git a/src/bin/elementary/test_ui_pager_scroll.c b/src/bin/elementary/test_ui_pager_scroll.c index e25132d37b..9d1857ec9e 100644 --- a/src/bin/elementary/test_ui_pager_scroll.c +++ b/src/bin/elementary/test_ui_pager_scroll.c @@ -296,7 +296,7 @@ static void pack_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED) index = efl_ui_range_value_get(param->pack_sp); if (index > cnt) efl_ui_range_value_set(param->pack_sp, cnt); - efl_ui_range_min_max_set(param->pack_sp, 0, cnt); + efl_ui_range_limits_set(param->pack_sp, 0, cnt); if (cnt > 0) { @@ -307,7 +307,7 @@ static void pack_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED) index = efl_ui_range_value_get(param->unpack_sp); if (index > cnt) efl_ui_range_value_set(param->unpack_sp, cnt); - efl_ui_range_min_max_set(param->unpack_sp, 0, cnt); + efl_ui_range_limits_set(param->unpack_sp, 0, cnt); } else { @@ -415,7 +415,7 @@ static void page_size_cb(void *data, efl_gfx_entity_visible_set(ck, 1); sl = efl_add(EFL_UI_SLIDER_CLASS, inbox, - efl_ui_range_min_max_set(efl_added, 100, 200), + efl_ui_range_limits_set(efl_added, 100, 200), efl_ui_range_value_set(efl_added, params->w), efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, @@ -456,7 +456,7 @@ static void page_size_cb(void *data, efl_gfx_entity_visible_set(ck, 1); sl = efl_add(EFL_UI_SLIDER_CLASS, inbox, - efl_ui_range_min_max_set(efl_added, 100, 300), + efl_ui_range_limits_set(efl_added, 100, 300), efl_ui_range_value_set(efl_added, params->h), efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, @@ -500,7 +500,7 @@ static void padding_cb(void *data, efl_added, NULL)); efl_add(EFL_UI_SLIDER_CLASS, box, - efl_ui_range_min_max_set(efl_added, 0, 50), + efl_ui_range_limits_set(efl_added, 0, 50), efl_ui_range_value_set(efl_added, params->padding), efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, @@ -529,7 +529,7 @@ static void side_page_num_cb(void *data, efl_add(EFL_UI_SLIDER_CLASS, box, efl_text_set(efl_added, "side page num"), efl_ui_format_string_set(efl_part(efl_added, "indicator"), "%1.0f"), - efl_ui_range_min_max_set(efl_added, 0, 3), + efl_ui_range_limits_set(efl_added, 0, 3), efl_ui_range_value_set(efl_added, params->side_page_num), efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), efl_gfx_hint_weight_set(efl_added, 1, 1), @@ -564,7 +564,7 @@ static void pack_cb(void *data, efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)); sp1 = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box1, - efl_ui_range_min_max_set(efl_added, 0, + efl_ui_range_limits_set(efl_added, 0, efl_content_count(pager)), efl_ui_range_value_set(efl_added, efl_ui_pager_current_page_get(pager))); @@ -688,7 +688,7 @@ static void pack_cb(void *data, if (efl_content_count(pager) > 0) { - efl_ui_range_min_max_set(sp2, 0, + efl_ui_range_limits_set(sp2, 0, (efl_content_count(pager) - 1)); efl_ui_range_value_set(sp2, efl_ui_pager_current_page_get(pager)); @@ -753,7 +753,7 @@ static void current_page_cb(void *data, if (efl_content_count(pager) > 0) { - efl_ui_range_min_max_set(sp, 0, + efl_ui_range_limits_set(sp, 0, (efl_content_count(pager) - 1)); efl_ui_range_value_set(sp, efl_ui_pager_current_page_get(pager)); diff --git a/src/bin/elementary/test_ui_progressbar.c b/src/bin/elementary/test_ui_progressbar.c index ffb7084349..04cb6d4c50 100644 --- a/src/bin/elementary/test_ui_progressbar.c +++ b/src/bin/elementary/test_ui_progressbar.c @@ -133,7 +133,7 @@ test_ui_progressbar(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf pd->pb1 = efl_add(EFL_UI_PROGRESSBAR_CLASS, bx, efl_pack(bx, efl_added), efl_text_set(efl_added, "percent"), - efl_ui_range_min_max_set(efl_added, 0, 100), + efl_ui_range_limits_set(efl_added, 0, 100), efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(250, 20)) ); @@ -149,7 +149,7 @@ test_ui_progressbar(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf efl_text_set(efl_added, "10-100"), efl_ui_progressbar_pulse_set(efl_added, EINA_TRUE), efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(250, 20)), - efl_ui_range_min_max_set(efl_added, 10, 100), + efl_ui_range_limits_set(efl_added, 10, 100), efl_ui_range_value_set(efl_added, 10) ); diff --git a/src/bin/elementary/test_ui_relative_layout.c b/src/bin/elementary/test_ui_relative_layout.c index 35c8adf823..c108dd6cf7 100644 --- a/src/bin/elementary/test_ui_relative_layout.c +++ b/src/bin/elementary/test_ui_relative_layout.c @@ -171,7 +171,7 @@ _setter_add(Eo *vbox, Eo *btn, Options option) efl_pack(hbox, efl_added)); efl_add(EFL_UI_SLIDER_CLASS, hbox, - efl_ui_range_min_max_set(efl_added, 0.0, 1.0), + efl_ui_range_limits_set(efl_added, 0.0, 1.0), efl_ui_range_step_set(efl_added, 0.1), efl_ui_range_value_set(efl_added, relative), efl_key_wref_set(efl_added, "btn", btn), @@ -242,7 +242,7 @@ _button_frame_add(Eo *box, Eo *btn) efl_pack(hbox, efl_added)); efl_add(EFL_UI_SLIDER_CLASS, hbox, - efl_ui_range_min_max_set(efl_added, 0.0, 1.0), + efl_ui_range_limits_set(efl_added, 0.0, 1.0), efl_ui_range_step_set(efl_added, 0.1), efl_ui_range_value_set(efl_added, align_x), efl_key_wref_set(efl_added, "btn", btn), @@ -262,7 +262,7 @@ _button_frame_add(Eo *box, Eo *btn) efl_pack(hbox, efl_added)); efl_add(EFL_UI_SLIDER_CLASS, hbox, - efl_ui_range_min_max_set(efl_added, 0.0, 1.0), + efl_ui_range_limits_set(efl_added, 0.0, 1.0), efl_ui_range_step_set(efl_added, 0.1), efl_ui_range_value_set(efl_added, align_y), efl_key_wref_set(efl_added, "btn", btn), diff --git a/src/bin/elementary/test_ui_slider.c b/src/bin/elementary/test_ui_slider.c index b91decade4..38447efbc4 100644 --- a/src/bin/elementary/test_ui_slider.c +++ b/src/bin/elementary/test_ui_slider.c @@ -81,7 +81,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event efl_add(EFL_UI_SLIDER_CLASS, bx, efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(120, 0)), - efl_ui_range_min_max_set(efl_added, 10, 145), + efl_ui_range_limits_set(efl_added, 10, 145), efl_ui_range_step_set(efl_added, step), elm_object_disabled_set(efl_added, EINA_TRUE), efl_pack(bx, efl_added)); @@ -97,7 +97,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event efl_add(EFL_UI_SLIDER_CLASS, hbx, efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(0, 160)), - efl_ui_range_min_max_set(efl_added, 10, 145), + efl_ui_range_limits_set(efl_added, 10, 145), efl_ui_range_step_set(efl_added, step), efl_ui_range_value_set(efl_added, 70), efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), @@ -105,7 +105,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event efl_add(EFL_UI_SLIDER_CLASS, hbx, efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(0, 160)), - efl_ui_range_min_max_set(efl_added, 10, 145), + efl_ui_range_limits_set(efl_added, 10, 145), efl_ui_range_step_set(efl_added, step), efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), elm_object_disabled_set(efl_added, EINA_TRUE), @@ -113,7 +113,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event efl_add(EFL_UI_SLIDER_CLASS, hbx, efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(0, 160)), - efl_ui_range_min_max_set(efl_added, 10, 145), + efl_ui_range_limits_set(efl_added, 10, 145), efl_ui_range_value_set(efl_added, 35), efl_ui_range_step_set(efl_added, step), efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL | EFL_UI_LAYOUT_ORIENTATION_INVERTED), @@ -126,7 +126,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event efl_add(EFL_UI_SLIDER_CLASS, bx, efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(260, 0)), - efl_ui_range_min_max_set(efl_added, 0, 150), + efl_ui_range_limits_set(efl_added, 0, 150), efl_ui_range_step_set(efl_added, step), efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _slider_changed_cb, NULL), efl_pack(bx, efl_added)); diff --git a/src/bin/elementary/test_ui_slider_interval.c b/src/bin/elementary/test_ui_slider_interval.c index 8f0b6c972a..9d4eccd3ca 100644 --- a/src/bin/elementary/test_ui_slider_interval.c +++ b/src/bin/elementary/test_ui_slider_interval.c @@ -70,7 +70,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx, efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(120, 0)), - efl_ui_range_min_max_set(efl_added, 10, 145), + efl_ui_range_limits_set(efl_added, 10, 145), efl_ui_slider_interval_value_set(efl_added, 50, 100), efl_ui_range_step_set(efl_added, step), elm_object_disabled_set(efl_added, EINA_TRUE), @@ -87,7 +87,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx, efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(0, 160)), - efl_ui_range_min_max_set(efl_added, 10, 145), + efl_ui_range_limits_set(efl_added, 10, 145), efl_ui_slider_interval_value_set(efl_added, 50, 100), efl_ui_range_step_set(efl_added, step), efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), @@ -95,7 +95,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx, efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(0, 160)), - efl_ui_range_min_max_set(efl_added, 10, 145), + efl_ui_range_limits_set(efl_added, 10, 145), efl_ui_slider_interval_value_set(efl_added, 50, 100), efl_ui_range_step_set(efl_added, step), efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), @@ -109,7 +109,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx, efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(260, 0)), - efl_ui_range_min_max_set(efl_added, 0, 600), + efl_ui_range_limits_set(efl_added, 0, 600), efl_ui_slider_interval_value_set(efl_added, 100, 500), efl_ui_range_step_set(efl_added, step), efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _intv_slider_changed_cb, NULL), diff --git a/src/bin/elementary/test_ui_spin.c b/src/bin/elementary/test_ui_spin.c index bf530e36df..1c5b86b531 100644 --- a/src/bin/elementary/test_ui_spin.c +++ b/src/bin/elementary/test_ui_spin.c @@ -47,7 +47,7 @@ test_ui_spin(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL)); sp = efl_add(EFL_UI_SPIN_CLASS, bx, - efl_ui_range_min_max_set(efl_added, 0, 10), + efl_ui_range_limits_set(efl_added, 0, 10), efl_ui_range_value_set(efl_added, 6), efl_ui_range_step_set(efl_added, 2), efl_ui_format_string_set(efl_added, "test %d"), diff --git a/src/bin/elementary/test_ui_spin_button.c b/src/bin/elementary/test_ui_spin_button.c index 293d996526..52455e67ef 100644 --- a/src/bin/elementary/test_ui_spin_button.c +++ b/src/bin/elementary/test_ui_spin_button.c @@ -38,7 +38,7 @@ test_ui_spin_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL)); efl_add(EFL_UI_SPIN_BUTTON_CLASS, bx, - efl_ui_range_min_max_set(efl_added, 0, 10), + efl_ui_range_limits_set(efl_added, 0, 10), efl_ui_range_value_set(efl_added, 6), efl_ui_range_step_set(efl_added, 2), efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE), @@ -47,14 +47,14 @@ test_ui_spin_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * efl_pack(bx, efl_added)); efl_add(EFL_UI_SPIN_BUTTON_CLASS, bx, - efl_ui_range_min_max_set(efl_added, -100.0, 100.0), + efl_ui_range_limits_set(efl_added, -100.0, 100.0), efl_ui_range_value_set(efl_added, 0), efl_ui_format_string_set(efl_added, "test float %0.2f"), efl_ui_spin_button_editable_set(efl_added, EINA_FALSE), efl_pack(bx, efl_added)); efl_add(EFL_UI_SPIN_BUTTON_CLASS, bx, - efl_ui_range_min_max_set(efl_added, 1, 12), + efl_ui_range_limits_set(efl_added, 1, 12), efl_ui_range_value_set(efl_added, 1), efl_ui_spin_button_editable_set(efl_added, EINA_FALSE), efl_ui_spin_special_value_set(efl_added, array), diff --git a/src/bin/elementary/test_ui_tab_pager.c b/src/bin/elementary/test_ui_tab_pager.c index d2c0e6b7cd..ae579a47de 100644 --- a/src/bin/elementary/test_ui_tab_pager.c +++ b/src/bin/elementary/test_ui_tab_pager.c @@ -229,7 +229,7 @@ _current_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) elm_naviframe_item_push(navi, "Current", btn, NULL, efl_added, NULL)); sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, box, - efl_ui_range_min_max_set(efl_added, 0, efl_content_count(tab_pager) - 1), + efl_ui_range_limits_set(efl_added, 0, efl_content_count(tab_pager) - 1), efl_ui_range_value_set(efl_added, efl_ui_active_view_active_index_get(tab_pager)), efl_pack_end(box, efl_added)); @@ -304,7 +304,7 @@ _pack_at_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED) tab_page = tab_page_add(tsd->tab_pager); efl_pack_at(tsd->tab_pager, tab_page, elm_spinner_value_get(tsd->spinner)); - efl_ui_range_min_max_set(tsd->spinner, 0, efl_content_count(tsd->tab_pager) - 1); + efl_ui_range_limits_set(tsd->spinner, 0, efl_content_count(tsd->tab_pager) - 1); } static void @@ -363,7 +363,7 @@ _pack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) efl_pack_end(box, efl_added)); sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box, - efl_ui_range_min_max_set(efl_added, 0, efl_content_count(tab_pager) - 1), + efl_ui_range_limits_set(efl_added, 0, efl_content_count(tab_pager) - 1), efl_ui_range_value_set(efl_added, efl_ui_active_view_active_index_get(tab_pager)), efl_pack_end(in_box, efl_added)); @@ -408,7 +408,7 @@ _unpack_at_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED) Tab_Set_Data *tsd = data; efl_pack_unpack_at(tsd->tab_pager, elm_spinner_value_get(tsd->spinner)); - efl_ui_range_min_max_set(tsd->spinner, 0, efl_content_count(tsd->tab_pager) - 1); + efl_ui_range_limits_set(tsd->spinner, 0, efl_content_count(tsd->tab_pager) - 1); } static void @@ -463,7 +463,7 @@ _unpack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) efl_pack_end(box, efl_added)); sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box, - efl_ui_range_min_max_set(efl_added, 0, efl_content_count(tab_pager) - 1), + efl_ui_range_limits_set(efl_added, 0, efl_content_count(tab_pager) - 1), efl_ui_range_value_set(efl_added, efl_ui_active_view_active_index_get(tab_pager)), efl_pack_end(in_box, efl_added)); diff --git a/src/examples/elementary/efl_ui_list_example_1.c b/src/examples/elementary/efl_ui_list_example_1.c index f204e7bf09..135b8a2d3c 100644 --- a/src/examples/elementary/efl_ui_list_example_1.c +++ b/src/examples/elementary/efl_ui_list_example_1.c @@ -271,7 +271,7 @@ elm_main(int argc EINA_UNUSED, char **argv) efl_gfx_hint_weight_set(slider, 0.0, 0.05); efl_gfx_hint_align_set(slider, 0.5, 0.5); efl_gfx_hint_size_min_set(slider, EINA_SIZE2D(380, 20)); - efl_ui_range_min_max_set(slider, 0.0, 1.0); + efl_ui_range_limits_set(slider, 0.0, 1.0); efl_pack_end(wbox, slider); bbox = efl_add(EFL_UI_BOX_CLASS, wbox); diff --git a/src/examples/elementary/slider_cxx_example.cc b/src/examples/elementary/slider_cxx_example.cc index 37121240e1..bc6bd76bdb 100644 --- a/src/examples/elementary/slider_cxx_example.cc +++ b/src/examples/elementary/slider_cxx_example.cc @@ -43,12 +43,12 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) bx.pack_end(sl3); efl::ui::Slider sl4(instantiate, win); - sl4.range_min_max_set(0, 100); + sl4.range_limits_set(0, 100); sl4.hint_fill_set(true, false); bx.pack_end(sl4); efl::ui::Slider sl5(instantiate, win); - sl5.range_min_max_set(0, 100); + sl5.range_limits_set(0, 100); sl5.range_step_set(1); sl5.orientation_set((Efl_Ui_Layout_Orientation)(EFL_UI_LAYOUT_ORIENTATION_VERTICAL | EFL_UI_LAYOUT_ORIENTATION_INVERTED)); sl5.hint_fill_set(true, false); @@ -57,7 +57,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) efl::ui::Slider sl6(instantiate, win); sl6.orientation_set(EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL); - sl6.range_min_max_set(0, 10); + sl6.range_limits_set(0, 10); sl6.hint_fill_set(false, true); sl6.hint_weight_set(0, EFL_GFX_HINT_EXPAND); bx.pack_end(sl6); diff --git a/src/lib/efl/interfaces/efl_ui_range_display.eo b/src/lib/efl/interfaces/efl_ui_range_display.eo index c71f6d01de..39ca1b2113 100644 --- a/src/lib/efl/interfaces/efl_ui_range_display.eo +++ b/src/lib/efl/interfaces/efl_ui_range_display.eo @@ -19,7 +19,7 @@ interface @beta Efl.Ui.Range_Display val: double; [[The range value (must be between $0.0 and 1.0)]] } } - @property range_min_max { + @property range_limits { set { [[Set the minimum and maximum values for given range widget. diff --git a/src/lib/elementary/efl_ui_datepicker.c b/src/lib/elementary/efl_ui_datepicker.c index 671822fca9..810c9bc4c4 100644 --- a/src/lib/elementary/efl_ui_datepicker.c +++ b/src/lib/elementary/efl_ui_datepicker.c @@ -133,7 +133,7 @@ _field_changed_cb(void *data, const Efl_Event *ev) if (!(ev->object == pd->day)) { max_day = _max_days_get((pd->cur_date[DATEPICKER_YEAR] - 1900), (pd->cur_date[DATEPICKER_MONTH] - 1)); - efl_ui_range_min_max_set(pd->day, 1, max_day); + efl_ui_range_limits_set(pd->day, 1, max_day); } if (_validate_date_limits(pd->cur_date, pd->min_date, EINA_FALSE) || @@ -160,21 +160,21 @@ _fields_init(Eo *obj) //Field create. pd->year = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj, - efl_ui_range_min_max_set(efl_added, 1970, 2037), + efl_ui_range_limits_set(efl_added, 1970, 2037), efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE), efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED,_field_changed_cb, obj)); pd->month = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj, - efl_ui_range_min_max_set(efl_added, 1, 12), + efl_ui_range_limits_set(efl_added, 1, 12), efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE), efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED,_field_changed_cb, obj)); pd->day = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj, - efl_ui_range_min_max_set(efl_added, 1, 31), + efl_ui_range_limits_set(efl_added, 1, 31), efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE), efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c index d7034b1167..ce48253169 100644 --- a/src/lib/elementary/efl_ui_progressbar.c +++ b/src/lib/elementary/efl_ui_progressbar.c @@ -414,7 +414,7 @@ _efl_ui_progressbar_efl_object_constructor(Eo *obj, Efl_Ui_Progressbar_Data *_pd obj = efl_constructor(efl_super(obj, MY_CLASS)); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PROGRESS_BAR); - efl_ui_range_min_max_set(obj, 0.0, 1.0); + efl_ui_range_limits_set(obj, 0.0, 1.0); return obj; } @@ -540,7 +540,7 @@ _progressbar_part_value_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, const char *pa Eina_Bool is_cur_progressbar = !strcmp(part_name, curprogresspart[elm_widget_is_legacy(obj)]); if ((!is_cur_progressbar) || sd->has_cur_progressbar_part) - efl_ui_range_min_max_get(efl_part(obj, part_name), &min, &max); + efl_ui_range_limits_get(efl_part(obj, part_name), &min, &max); if (val < min) val = min; if (val > max) val = max; @@ -666,7 +666,7 @@ _efl_ui_progressbar_pulse_get(const Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data } EOLIAN static void -_efl_ui_progressbar_efl_ui_range_display_range_min_max_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, double min, double max) +_efl_ui_progressbar_efl_ui_range_display_range_limits_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, double min, double max) { if (elm_widget_is_legacy(obj)) _progress_part_min_max_set(obj, sd, "elm.cur.progressbar", min, max); @@ -675,7 +675,7 @@ _efl_ui_progressbar_efl_ui_range_display_range_min_max_set(Eo *obj, Efl_Ui_Progr } EOLIAN static void -_efl_ui_progressbar_efl_ui_range_display_range_min_max_get(const Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd, double *min, double *max) +_efl_ui_progressbar_efl_ui_range_display_range_limits_get(const Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd, double *min, double *max) { if (min) *min = sd->val_min; if (max) *max = sd->val_max; @@ -721,7 +721,7 @@ _efl_ui_progressbar_efl_access_value_value_and_text_get(const Eo *obj EINA_UNUSE } EOLIAN static void -_efl_ui_progressbar_part_efl_ui_range_display_range_min_max_set(Eo *obj, void *_pd EINA_UNUSED, double min, double max) +_efl_ui_progressbar_part_efl_ui_range_display_range_limits_set(Eo *obj, void *_pd EINA_UNUSED, double min, double max) { Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS); @@ -730,7 +730,7 @@ _efl_ui_progressbar_part_efl_ui_range_display_range_min_max_set(Eo *obj, void *_ } EOLIAN static void -_efl_ui_progressbar_part_efl_ui_range_display_range_min_max_get(const Eo *obj, void *_pd EINA_UNUSED, double *min, double *max) +_efl_ui_progressbar_part_efl_ui_range_display_range_limits_get(const Eo *obj, void *_pd EINA_UNUSED, double *min, double *max) { Efl_Ui_Progress_Status *ps; Eina_List *l; diff --git a/src/lib/elementary/efl_ui_progressbar.eo b/src/lib/elementary/efl_ui_progressbar.eo index f770709d96..a26ba6742f 100644 --- a/src/lib/elementary/efl_ui_progressbar.eo +++ b/src/lib/elementary/efl_ui_progressbar.eo @@ -46,7 +46,7 @@ class @beta Efl.Ui.Progressbar extends Efl.Ui.Layout_Base implements Efl.Ui.Rang Efl.Object.constructor; Efl.Ui.Widget.theme_apply; Efl.Ui.Range_Display.range_value { get; set; } - Efl.Ui.Range_Display.range_min_max {get; set; } + Efl.Ui.Range_Display.range_limits {get; set; } Efl.Ui.Layout_Orientable.orientation { get; set; } Efl.Ui.Format.format_cb { set; } Efl.Part.part_get; diff --git a/src/lib/elementary/efl_ui_progressbar_part.eo b/src/lib/elementary/efl_ui_progressbar_part.eo index b80177dd16..212c427f47 100644 --- a/src/lib/elementary/efl_ui_progressbar_part.eo +++ b/src/lib/elementary/efl_ui_progressbar_part.eo @@ -4,6 +4,6 @@ class @beta Efl.Ui.Progressbar_Part extends Efl.Ui.Layout_Part implements Efl.Ui data: null; implements { Efl.Ui.Range_Display.range_value { set; get; } - Efl.Ui.Range_Display.range_min_max {get; set; } + Efl.Ui.Range_Display.range_limits {get; set; } } } diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c index 4977adec5a..6b2c78953e 100644 --- a/src/lib/elementary/efl_ui_slider.c +++ b/src/lib/elementary/efl_ui_slider.c @@ -718,7 +718,7 @@ _efl_ui_slider_efl_ui_layout_orientable_orientation_get(const Eo *obj EINA_UNUSE } EOLIAN static void -_efl_ui_slider_efl_ui_range_display_range_min_max_set(Eo *obj, Efl_Ui_Slider_Data *sd, double min, double max) +_efl_ui_slider_efl_ui_range_display_range_limits_set(Eo *obj, Efl_Ui_Slider_Data *sd, double min, double max) { if ((sd->val_min == min) && (sd->val_max == max)) return; sd->val_min = min; @@ -730,7 +730,7 @@ _efl_ui_slider_efl_ui_range_display_range_min_max_set(Eo *obj, Efl_Ui_Slider_Dat } EOLIAN static void -_efl_ui_slider_efl_ui_range_display_range_min_max_get(const Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd, double *min, double *max) +_efl_ui_slider_efl_ui_range_display_range_limits_get(const Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd, double *min, double *max) { if (min) *min = sd->val_min; if (max) *max = sd->val_max; diff --git a/src/lib/elementary/efl_ui_slider.eo b/src/lib/elementary/efl_ui_slider.eo index e8d04b3ddb..364b226db6 100644 --- a/src/lib/elementary/efl_ui_slider.eo +++ b/src/lib/elementary/efl_ui_slider.eo @@ -11,7 +11,7 @@ class @beta Efl.Ui.Slider extends Efl.Ui.Layout_Base implements Efl.Ui.Range_Int Efl.Ui.Focus.Object.on_focus_update; Efl.Ui.Widget.widget_input_event_handler; Efl.Ui.Range_Display.range_value { get; set; } - Efl.Ui.Range_Display.range_min_max {get; set; } + Efl.Ui.Range_Display.range_limits {get; set; } Efl.Ui.Range_Interactive.range_step { get; set; } Efl.Ui.Layout_Orientable.orientation { get; set; } Efl.Access.Value.value_and_text { get; set; } diff --git a/src/lib/elementary/efl_ui_spin.c b/src/lib/elementary/efl_ui_spin.c index f446bab9f3..feb3f543af 100644 --- a/src/lib/elementary/efl_ui_spin.c +++ b/src/lib/elementary/efl_ui_spin.c @@ -308,7 +308,7 @@ _efl_ui_spin_efl_ui_format_format_cb_set(Eo *obj, Efl_Ui_Spin_Data *sd, void *fu } EOLIAN static void -_efl_ui_spin_efl_ui_range_display_range_min_max_set(Eo *obj, Efl_Ui_Spin_Data *sd, double min, double max) +_efl_ui_spin_efl_ui_range_display_range_limits_set(Eo *obj, Efl_Ui_Spin_Data *sd, double min, double max) { if (max < min) { @@ -329,7 +329,7 @@ _efl_ui_spin_efl_ui_range_display_range_min_max_set(Eo *obj, Efl_Ui_Spin_Data *s } EOLIAN static void -_efl_ui_spin_efl_ui_range_display_range_min_max_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spin_Data *sd, double *min, double *max) +_efl_ui_spin_efl_ui_range_display_range_limits_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spin_Data *sd, double *min, double *max) { if (min) *min = sd->val_min; if (max) *max = sd->val_max; diff --git a/src/lib/elementary/efl_ui_spin.eo b/src/lib/elementary/efl_ui_spin.eo index e523ecbd3b..4fee3df56c 100644 --- a/src/lib/elementary/efl_ui_spin.eo +++ b/src/lib/elementary/efl_ui_spin.eo @@ -35,7 +35,7 @@ class @beta Efl.Ui.Spin extends Efl.Ui.Layout_Base implements Efl.Ui.Range_Inter Efl.Object.constructor; Efl.Object.destructor; Efl.Ui.Widget.widget_input_event_handler; - Efl.Ui.Range_Display.range_min_max { get; set; } + Efl.Ui.Range_Display.range_limits { get; set; } Efl.Ui.Range_Interactive.range_step { get; set; } Efl.Ui.Range_Display.range_value { get; set; } Efl.Ui.Format.format_cb { set; } diff --git a/src/lib/elementary/efl_ui_timepicker.c b/src/lib/elementary/efl_ui_timepicker.c index 08a106f557..938c22c846 100644 --- a/src/lib/elementary/efl_ui_timepicker.c +++ b/src/lib/elementary/efl_ui_timepicker.c @@ -122,14 +122,14 @@ _fields_init(Eo *obj) //Field create. pd->hour = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj, - efl_ui_range_min_max_set(efl_added, 1, 12), + efl_ui_range_limits_set(efl_added, 1, 12), efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE), efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED,_field_changed_cb, obj)); pd->min = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj, - efl_ui_range_min_max_set(efl_added, 0, 59), + efl_ui_range_limits_set(efl_added, 0, 59), efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE), efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c index f9ba061f75..53bc6d0ce9 100644 --- a/src/lib/elementary/elm_flipselector.c +++ b/src/lib/elementary/elm_flipselector.c @@ -473,7 +473,7 @@ _items_add(Evas_Object *obj) } EOLIAN static void -_elm_flipselector_efl_ui_range_display_range_min_max_set(Eo *obj, Elm_Flipselector_Data *sd, double min, double max) +_elm_flipselector_efl_ui_range_display_range_limits_set(Eo *obj, Elm_Flipselector_Data *sd, double min, double max) { if ((sd->val_min == min) && (sd->val_max == max)) return; @@ -484,7 +484,7 @@ _elm_flipselector_efl_ui_range_display_range_min_max_set(Eo *obj, Elm_Flipselect } EOLIAN static void -_elm_flipselector_efl_ui_range_display_range_min_max_get(const Eo *obj EINA_UNUSED, Elm_Flipselector_Data *sd, double *min, double *max) +_elm_flipselector_efl_ui_range_display_range_limits_get(const Eo *obj EINA_UNUSED, Elm_Flipselector_Data *sd, double *min, double *max) { if (min) *min = sd->val_min; if (max) *max = sd->val_max; diff --git a/src/lib/elementary/elm_flipselector_eo.c b/src/lib/elementary/elm_flipselector_eo.c index f4bdae836b..3ad73d3a17 100644 --- a/src/lib/elementary/elm_flipselector_eo.c +++ b/src/lib/elementary/elm_flipselector_eo.c @@ -76,10 +76,10 @@ Eina_Error _elm_flipselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Flipselector Eina_Bool _elm_flipselector_efl_ui_widget_widget_input_event_handler(Eo *obj, Elm_Flipselector_Data *pd, const Efl_Event *eo_event, Efl_Canvas_Object *source); -void _elm_flipselector_efl_ui_range_display_range_min_max_set(Eo *obj, Elm_Flipselector_Data *pd, double min, double max); +void _elm_flipselector_efl_ui_range_display_range_limits_set(Eo *obj, Elm_Flipselector_Data *pd, double min, double max); -void _elm_flipselector_efl_ui_range_display_range_min_max_get(const Eo *obj, Elm_Flipselector_Data *pd, double *min, double *max); +void _elm_flipselector_efl_ui_range_display_range_limits_get(const Eo *obj, Elm_Flipselector_Data *pd, double *min, double *max); void _elm_flipselector_efl_ui_range_interactive_range_step_set(Eo *obj, Elm_Flipselector_Data *pd, double step); @@ -122,8 +122,8 @@ _elm_flipselector_class_initializer(Efl_Class *klass) EFL_OBJECT_OP_FUNC(efl_constructor, _elm_flipselector_efl_object_constructor), EFL_OBJECT_OP_FUNC(efl_ui_widget_theme_apply, _elm_flipselector_efl_ui_widget_theme_apply), EFL_OBJECT_OP_FUNC(efl_ui_widget_input_event_handler, _elm_flipselector_efl_ui_widget_widget_input_event_handler), - EFL_OBJECT_OP_FUNC(efl_ui_range_min_max_set, _elm_flipselector_efl_ui_range_display_range_min_max_set), - EFL_OBJECT_OP_FUNC(efl_ui_range_min_max_get, _elm_flipselector_efl_ui_range_display_range_min_max_get), + EFL_OBJECT_OP_FUNC(efl_ui_range_limits_set, _elm_flipselector_efl_ui_range_display_range_limits_set), + EFL_OBJECT_OP_FUNC(efl_ui_range_limits_get, _elm_flipselector_efl_ui_range_display_range_limits_get), EFL_OBJECT_OP_FUNC(efl_ui_range_step_set, _elm_flipselector_efl_ui_range_interactive_range_step_set), EFL_OBJECT_OP_FUNC(efl_ui_range_step_get, _elm_flipselector_efl_ui_range_interactive_range_step_get), EFL_OBJECT_OP_FUNC(efl_ui_range_value_set, _elm_flipselector_efl_ui_range_display_range_value_set), diff --git a/src/lib/elementary/elm_slider.c b/src/lib/elementary/elm_slider.c index 927c6f8860..b1d8313d23 100644 --- a/src/lib/elementary/elm_slider.c +++ b/src/lib/elementary/elm_slider.c @@ -1357,13 +1357,13 @@ elm_slider_range_get(const Evas_Object *obj, double *from, double *to) EAPI void elm_slider_min_max_set(Evas_Object *obj, double min, double max) { - efl_ui_range_min_max_set(obj, min, max); + efl_ui_range_limits_set(obj, min, max); } EAPI void elm_slider_min_max_get(const Evas_Object *obj, double *min, double *max) { - efl_ui_range_min_max_get(obj, min, max); + efl_ui_range_limits_get(obj, min, max); } EAPI void diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c index 3c35f0e2ce..ba22b6fa06 100644 --- a/src/lib/elementary/elm_spinner.c +++ b/src/lib/elementary/elm_spinner.c @@ -1372,13 +1372,13 @@ elm_spinner_add(Evas_Object *parent) EAPI void elm_spinner_min_max_set(Evas_Object *obj, double min, double max) { - efl_ui_range_min_max_set(obj, min, max); + efl_ui_range_limits_set(obj, min, max); } EAPI void elm_spinner_min_max_get(const Evas_Object *obj, double *min, double *max) { - efl_ui_range_min_max_get(obj, min, max); + efl_ui_range_limits_get(obj, min, max); } EAPI void @@ -1449,7 +1449,7 @@ _elm_spinner_label_format_get(const Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd) } EOLIAN static void -_elm_spinner_efl_ui_range_display_range_min_max_set(Eo *obj, Elm_Spinner_Data *sd, double min, double max) +_elm_spinner_efl_ui_range_display_range_limits_set(Eo *obj, Elm_Spinner_Data *sd, double min, double max) { if ((sd->val_min == min) && (sd->val_max == max)) return; @@ -1464,7 +1464,7 @@ _elm_spinner_efl_ui_range_display_range_min_max_set(Eo *obj, Elm_Spinner_Data *s } EOLIAN static void -_elm_spinner_efl_ui_range_display_range_min_max_get(const Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, double *min, double *max) +_elm_spinner_efl_ui_range_display_range_limits_get(const Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, double *min, double *max) { if (min) *min = sd->val_min; if (max) *max = sd->val_max; diff --git a/src/lib/elementary/elm_spinner_eo.c b/src/lib/elementary/elm_spinner_eo.c index d8ac147ba0..f4dde7d242 100644 --- a/src/lib/elementary/elm_spinner_eo.c +++ b/src/lib/elementary/elm_spinner_eo.c @@ -222,10 +222,10 @@ Eina_Bool _elm_spinner_efl_ui_focus_object_on_focus_update(Eo *obj, Elm_Spinner_ Eina_Bool _elm_spinner_efl_ui_widget_widget_input_event_handler(Eo *obj, Elm_Spinner_Data *pd, const Efl_Event *eo_event, Efl_Canvas_Object *source); -void _elm_spinner_efl_ui_range_display_range_min_max_set(Eo *obj, Elm_Spinner_Data *pd, double min, double max); +void _elm_spinner_efl_ui_range_display_range_limits_set(Eo *obj, Elm_Spinner_Data *pd, double min, double max); -void _elm_spinner_efl_ui_range_display_range_min_max_get(const Eo *obj, Elm_Spinner_Data *pd, double *min, double *max); +void _elm_spinner_efl_ui_range_display_range_limits_get(const Eo *obj, Elm_Spinner_Data *pd, double *min, double *max); void _elm_spinner_efl_ui_range_interactive_range_step_set(Eo *obj, Elm_Spinner_Data *pd, double step); @@ -288,8 +288,8 @@ _elm_spinner_class_initializer(Efl_Class *klass) EFL_OBJECT_OP_FUNC(efl_ui_widget_on_access_update, _elm_spinner_efl_ui_widget_on_access_update), EFL_OBJECT_OP_FUNC(efl_ui_focus_object_on_focus_update, _elm_spinner_efl_ui_focus_object_on_focus_update), EFL_OBJECT_OP_FUNC(efl_ui_widget_input_event_handler, _elm_spinner_efl_ui_widget_widget_input_event_handler), - EFL_OBJECT_OP_FUNC(efl_ui_range_min_max_set, _elm_spinner_efl_ui_range_display_range_min_max_set), - EFL_OBJECT_OP_FUNC(efl_ui_range_min_max_get, _elm_spinner_efl_ui_range_display_range_min_max_get), + EFL_OBJECT_OP_FUNC(efl_ui_range_limits_set, _elm_spinner_efl_ui_range_display_range_limits_set), + EFL_OBJECT_OP_FUNC(efl_ui_range_limits_get, _elm_spinner_efl_ui_range_display_range_limits_get), EFL_OBJECT_OP_FUNC(efl_ui_range_step_set, _elm_spinner_efl_ui_range_interactive_range_step_set), EFL_OBJECT_OP_FUNC(efl_ui_range_step_get, _elm_spinner_efl_ui_range_interactive_range_step_get), EFL_OBJECT_OP_FUNC(efl_ui_range_value_set, _elm_spinner_efl_ui_range_display_range_value_set), -- cgit v1.2.1