summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-05-26 18:03:44 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-05-26 18:03:44 +0900
commit0510fb3e320c68383b2f667681bc79695b64943a (patch)
tree101a70127559fd00c5ed69ad31242e2312897ac8
parent0187c64a653566addc00e7bd2b02647a56152b00 (diff)
elm spiner - fix flag read to also use the right field
-rw-r--r--src/lib/elm_spinner.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index fdc99b8b2..7d868c94a 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -491,11 +491,11 @@ _elm_spinner_elm_widget_event(Eo *obj, Elm_Spinner_Data *sd EINA_UNUSED, Evas_Ob
491 Evas_Event_Mouse_Wheel *mev; 491 Evas_Event_Mouse_Wheel *mev;
492 (void) src; 492 (void) src;
493 493
494 if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE;
495
496 if (type == EVAS_CALLBACK_KEY_DOWN) 494 if (type == EVAS_CALLBACK_KEY_DOWN)
497 { 495 {
498 Eina_Bool ret; 496 Eina_Bool ret;
497
498 if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE;
499 ret = _elm_config_key_binding_call(obj, ev, key_actions); 499 ret = _elm_config_key_binding_call(obj, ev, key_actions);
500 if (!ret) 500 if (!ret)
501 { 501 {
@@ -506,12 +506,14 @@ _elm_spinner_elm_widget_event(Eo *obj, Elm_Spinner_Data *sd EINA_UNUSED, Evas_Ob
506 } 506 }
507 else if (type == EVAS_CALLBACK_KEY_UP) 507 else if (type == EVAS_CALLBACK_KEY_UP)
508 { 508 {
509 if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE;
509 if (sd->spin_timer) _spin_stop(obj); 510 if (sd->spin_timer) _spin_stop(obj);
510 else return EINA_FALSE; 511 else return EINA_FALSE;
511 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 512 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
512 } 513 }
513 else if (type == EVAS_CALLBACK_MOUSE_WHEEL) 514 else if (type == EVAS_CALLBACK_MOUSE_WHEEL)
514 { 515 {
516 if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE;
515 mev = event_info; 517 mev = event_info;
516 sd->interval = sd->first_interval; 518 sd->interval = sd->first_interval;
517 if (mev->z < 0) 519 if (mev->z < 0)