diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c index 2386b82293..f80b40badb 100644 --- a/src/lib/elementary/efl_ui_progressbar.c +++ b/src/lib/elementary/efl_ui_progressbar.c @@ -558,8 +558,17 @@ _progressbar_part_value_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, const char *pa _val_set(obj); _units_set(obj); - efl_event_callback_legacy_call - (obj, EFL_UI_RANGE_EVENT_CHANGED, NULL); + if (elm_widget_is_legacy(obj)) + efl_event_callback_legacy_call + (obj, EFL_UI_RANGE_EVENT_CHANGED, NULL); + else + { + efl_event_callback_call(obj, EFL_UI_RANGE_EVENT_CHANGED, NULL); + if (sd->val == min) + efl_event_callback_call(obj, EFL_UI_RANGE_EVENT_MIN_REACHED, NULL); + if (sd->val == max) + efl_event_callback_call(obj, EFL_UI_RANGE_EVENT_MAX_REACHED, NULL); + } } static double diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c index 40c188241e..50a9fab57d 100644 --- a/src/lib/elementary/efl_ui_slider.c +++ b/src/lib/elementary/efl_ui_slider.c @@ -48,6 +48,16 @@ _is_horizontal(Efl_Ui_Layout_Orientation dir) return efl_ui_layout_orientation_is_horizontal(dir, EINA_TRUE); } +static void +_emit_events(Eo *obj, Efl_Ui_Slider_Data *sd) +{ + efl_event_callback_call(obj, EFL_UI_RANGE_EVENT_CHANGED, NULL); + if (sd->val == sd->val_min) + efl_event_callback_call(obj, EFL_UI_RANGE_EVENT_MIN_REACHED, NULL); + if (sd->val == sd->val_max) + efl_event_callback_call(obj, EFL_UI_RANGE_EVENT_MAX_REACHED, NULL); +} + static void _efl_ui_slider_val_fetch(Evas_Object *obj, Efl_Ui_Slider_Data *sd, Eina_Bool user_event) { @@ -76,7 +86,7 @@ _efl_ui_slider_val_fetch(Evas_Object *obj, Efl_Ui_Slider_Data *sd, Eina_Bool us sd->val = val; if (user_event) { - efl_event_callback_call(obj, EFL_UI_RANGE_EVENT_CHANGED, NULL); + _emit_events(obj, sd); efl_event_callback_legacy_call(obj, EFL_UI_RANGE_EVENT_CHANGED, NULL); ecore_timer_del(sd->delay); sd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj); @@ -765,6 +775,7 @@ _efl_ui_slider_efl_ui_range_display_range_value_set(Eo *obj, Efl_Ui_Slider_Data if (sd->val < sd->val_min) sd->val = sd->val_min; if (sd->val > sd->val_max) sd->val = sd->val_max; + _emit_events(obj, sd); efl_ui_slider_val_set(obj); }