[EGIT] [core/efl] master 10/11: efl_ui_spin_button: fix event calling in spin_button

[Marcel Hollerbach]

bu5hm4n pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=d5df7e459d0bddd63b213ab8ac7a87cd0b1c08fc

commit d5df7e459d0bddd63b213ab8ac7a87cd0b1c08fc
Author: Marcel Hollerbach <m...@marcel-hollerbach.de>
Date:   Sun Jul 7 16:58:01 2019 +0200

    efl_ui_spin_button: fix event calling in spin_button
    
    before the spin event for changing the value was called twice if you
    changed the value by the entry. Additionally, the changed,delay event is
    not emitted when the value was changed via the arrow buttons.
    This corrects this, additionally, this enables the delay timer when
    focus is gone, this is expected and should be supported by the API.
    
    Reviewed-by: Mike Blumenkrantz <michael.blumenkra...@gmail.com>
    Differential Revision: https://phab.enlightenment.org/D9231
---
 src/bin/elementary/test_ui_spin_button.c |  7 +++++++
 src/lib/elementary/efl_ui_spin_button.c  | 29 ++++++++++-------------------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/bin/elementary/test_ui_spin_button.c 
b/src/bin/elementary/test_ui_spin_button.c
index 82a207f1b0..12cd7f1e92 100644
--- a/src/bin/elementary/test_ui_spin_button.c
+++ b/src/bin/elementary/test_ui_spin_button.c
@@ -12,6 +12,12 @@ _spin_delay_changed_cb(void *data EINA_UNUSED, const 
Efl_Event *ev)
    printf("Value delay changed %d\n", (int)efl_ui_range_value_get(ev->object));
 }
 
+static void
+_spin_changed_cb(void *data EINA_UNUSED, const Efl_Event *ev)
+{
+   printf("Value changed %d\n", (int)efl_ui_range_value_get(ev->object));
+}
+
 void
 test_ui_spin_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void 
*event_info EINA_UNUSED)
 {
@@ -38,6 +44,7 @@ test_ui_spin_button(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *
            efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE),
            efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
            efl_event_callback_add(efl_added, 
EFL_UI_SPIN_BUTTON_EVENT_DELAY_CHANGED,_spin_delay_changed_cb, NULL),
+           efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED, 
_spin_changed_cb, NULL),
            efl_pack(bx, efl_added));
 
    efl_add(EFL_UI_SPIN_BUTTON_CLASS, bx,
diff --git a/src/lib/elementary/efl_ui_spin_button.c 
b/src/lib/elementary/efl_ui_spin_button.c
index 34de0b7d7e..f14c365ba8 100644
--- a/src/lib/elementary/efl_ui_spin_button.c
+++ b/src/lib/elementary/efl_ui_spin_button.c
@@ -138,6 +138,12 @@ _value_set(Evas_Object *obj,
         else if (new_val > pd->val_max)
           new_val = pd->val_min;
      }
+   else
+     {
+        new_val = MIN(pd->val_max, MAX(pd->val_min, new_val));
+     }
+
+   if (EINA_DBL_EQ(new_val, efl_ui_range_value_get(obj))) return EINA_TRUE;
 
    efl_ui_range_value_set(obj, new_val);
    ecore_timer_del(sd->delay_change_timer);
@@ -165,12 +171,10 @@ static void
 _entry_value_apply(Evas_Object *obj)
 {
    const char *str;
-   double val, val_min, val_max;
+   double val;
    char *end;
 
    Efl_Ui_Spin_Button_Data *sd = efl_data_scope_get(obj, MY_CLASS);
-   Efl_Ui_Spin_Data *pd = efl_data_scope_get(obj, EFL_UI_SPIN_CLASS);
-
    if (!sd->entry_visible) return;
 
    efl_event_callback_del(sd->ent, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED,
@@ -180,15 +184,7 @@ _entry_value_apply(Evas_Object *obj)
    if (!str) return;
 
    val = strtod(str, &end);
-   if (((*end != '\0') && (!isspace(*end))) || (fabs(val - pd->val) < 
DBL_EPSILON)) return;
-   efl_ui_range_limits_get(obj, &val_min, &val_max);
-   val = MIN(val_max, MAX(val_min, val));
-   efl_ui_range_value_set(obj, val);
-
-   efl_event_callback_call(obj, EFL_UI_SPIN_EVENT_CHANGED, NULL);
-   ecore_timer_del(sd->delay_change_timer);
-   sd->delay_change_timer = 
ecore_timer_add(EFL_UI_SPIN_BUTTON_DELAY_CHANGE_TIME,
-                                            _delay_change_timer_cb, obj);
+   _value_set(obj, val);
 }
 
 static void
@@ -403,8 +399,7 @@ _spin_value(Efl_Ui_Spin *obj, Eina_Bool inc)
 
    int absolut_value = efl_ui_range_value_get(obj) + (inc ? pd->step : 
-pd->step);
 
-   if (_value_set(obj, MIN(MAX(absolut_value, pd->val_min), pd->val_max)))
-     _label_write(obj);
+   _value_set(obj, absolut_value);
 }
 
 static void
@@ -476,11 +471,7 @@ _efl_ui_spin_button_efl_ui_focus_object_on_focus_update(Eo 
*obj, Efl_Ui_Spin_But
    int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
-   if (!efl_ui_focus_object_focus_get(obj))
-     {
-        ELM_SAFE_FREE(sd->delay_change_timer, ecore_timer_del);
-     }
-   else
+   if (efl_ui_focus_object_focus_get(obj))
      {
         if (sd->entry_reactivate)
           {

--