From 359a118cdaa9d044a2381a829c9bcae1be177b6c Mon Sep 17 00:00:00 2001 From: Xavi Artigas Date: Wed, 31 Jul 2019 10:36:37 +0000 Subject: [PATCH] Efl.Ui.Spin: Remove mouse wheel interaction This widget is now meant as a base class for other widgets, with very limited user interaction. Efl.Ui.Spin_Button already takes care of mouse wheel events. Ref T7897 Reviewed-by: Marcel Hollerbach Differential Revision: https://phab.enlightenment.org/D9453 --- src/lib/elementary/efl_ui_spin.c | 21 ---------------- src/lib/elementary/efl_ui_spin.eo | 1 - src/tests/elementary/efl_ui_test_spin.c | 32 ------------------------- 3 files changed, 54 deletions(-) diff --git a/src/lib/elementary/efl_ui_spin.c b/src/lib/elementary/efl_ui_spin.c index 1776fe33f3..0e50457f33 100644 --- a/src/lib/elementary/efl_ui_spin.c +++ b/src/lib/elementary/efl_ui_spin.c @@ -29,27 +29,6 @@ _label_write(Evas_Object *obj, Efl_Ui_Spin_Data *sd) eina_strbuf_free(strbuf); } -EOLIAN static Eina_Bool -_efl_ui_spin_efl_ui_widget_widget_input_event_handler(Eo *obj, Efl_Ui_Spin_Data *sd, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED) -{ - Eo *ev = eo_event->info; - - if (efl_input_processed_get(ev)) return EINA_FALSE; - - if (eo_event->desc == EFL_EVENT_POINTER_WHEEL) - { - if (efl_input_pointer_wheel_delta_get(ev) < 0) - efl_ui_range_value_set(obj, (efl_ui_range_value_get(obj) + sd->step)); - else - efl_ui_range_value_set(obj, (efl_ui_range_value_get(obj) - sd->step)); - } - else - return EINA_FALSE; - - efl_input_processed_set(ev, EINA_TRUE); - return EINA_TRUE; -} - EOLIAN static Eo * _efl_ui_spin_efl_object_constructor(Eo *obj, Efl_Ui_Spin_Data *sd) { diff --git a/src/lib/elementary/efl_ui_spin.eo b/src/lib/elementary/efl_ui_spin.eo index 55b1e45572..717c569e0d 100644 --- a/src/lib/elementary/efl_ui_spin.eo +++ b/src/lib/elementary/efl_ui_spin.eo @@ -9,7 +9,6 @@ class @beta Efl.Ui.Spin extends Efl.Ui.Layout_Base implements Efl.Ui.Range_Inter implements { Efl.Object.constructor; Efl.Object.destructor; - Efl.Ui.Widget.widget_input_event_handler; Efl.Ui.Range_Display.range_limits { get; set; } Efl.Ui.Range_Interactive.range_step { get; set; } Efl.Ui.Range_Display.range_value { get; set; } diff --git a/src/tests/elementary/efl_ui_test_spin.c b/src/tests/elementary/efl_ui_test_spin.c index abd55afd5c..3bbb551a7f 100644 --- a/src/tests/elementary/efl_ui_test_spin.c +++ b/src/tests/elementary/efl_ui_test_spin.c @@ -60,41 +60,9 @@ EFL_START_TEST (spin_value_events) } EFL_END_TEST -EFL_START_TEST (spin_wheel_test) -{ - Eina_Bool changed = EINA_FALSE, min_reached = EINA_FALSE, max_reached = EINA_FALSE; - - efl_ui_range_limits_set(spin, -100.0, 100.0); - efl_ui_range_value_set(spin, 0.0); - efl_ui_range_step_set(spin, 10.0); - efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_CHANGED, _set_flag, &changed); - efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_MIN_REACHED, _set_flag, &min_reached); - efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_MAX_REACHED, _set_flag, &max_reached); - - efl_gfx_entity_size_set(win, EINA_SIZE2D(60, 60)); - get_me_to_those_events(spin); - evas_event_feed_mouse_move(evas_object_evas_get(spin), 30, 30, 1234, NULL); - evas_event_feed_mouse_wheel(evas_object_evas_get(spin), -1, -1, 12345, NULL); - ck_assert(efl_ui_range_value_get(spin) == 10.0); - ck_assert_int_eq(changed, EINA_TRUE); - ck_assert_int_eq(min_reached, EINA_FALSE); - ck_assert_int_eq(max_reached, EINA_FALSE); - changed = EINA_FALSE; - min_reached = EINA_FALSE; - max_reached = EINA_FALSE; - - evas_event_feed_mouse_wheel(evas_object_evas_get(spin), -1, 1, 12345, NULL); - ck_assert(efl_ui_range_value_get(spin) == 0.0); - ck_assert_int_eq(changed, EINA_TRUE); - ck_assert_int_eq(min_reached, EINA_FALSE); - ck_assert_int_eq(max_reached, EINA_FALSE); -} -EFL_END_TEST - void efl_ui_test_spin(TCase *tc) { tcase_add_checked_fixture(tc, fail_on_errors_setup, fail_on_errors_teardown); tcase_add_checked_fixture(tc, spin_setup, NULL); tcase_add_test(tc, spin_value_events); - tcase_add_test(tc, spin_wheel_test); }