summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwoochan lee <wc0917.lee@samsung.com>2015-12-02 14:56:39 -0800
committerCedric BAIL <cedric@osg.samsung.com>2015-12-02 14:56:40 -0800
commit55c5f3b6169ea0a7e230675f6ba8c2b7b122cd6a (patch)
tree90f3ccdff6765d4f14c93db932a731f9828c0aeb
parent406b0937c0124c483450a6fbcc41cddfc758ba01 (diff)
spinner: prevent scrolling when longpress timer enabled.
Summary: Spinner on scroller case. Scroll should be freeze when spinner button in long press state. If not, the scolling will be started after delete longpress timer. Like a other widgets, scroll not allowing is correct action for this. @fix Reviewers: jaehwan, Hermet, eagleeye, cedric Differential Revision: https://phab.enlightenment.org/D3334 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
-rw-r--r--src/lib/elm_spinner.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index d2793bb17..251a3778f 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -540,6 +540,8 @@ _val_inc_start(void *data)
540 sd->spin_timer = ecore_timer_add(sd->interval, _spin_value, data); 540 sd->spin_timer = ecore_timer_add(sd->interval, _spin_value, data);
541 _spin_value(data); 541 _spin_value(data);
542 542
543 elm_widget_scroll_freeze_push(data);
544
543 return ECORE_CALLBACK_CANCEL; 545 return ECORE_CALLBACK_CANCEL;
544} 546}
545 547
@@ -555,6 +557,8 @@ _val_dec_start(void *data)
555 sd->spin_timer = ecore_timer_add(sd->interval, _spin_value, data); 557 sd->spin_timer = ecore_timer_add(sd->interval, _spin_value, data);
556 _spin_value(data); 558 _spin_value(data);
557 559
560 elm_widget_scroll_freeze_push(data);
561
558 return ECORE_CALLBACK_CANCEL; 562 return ECORE_CALLBACK_CANCEL;
559} 563}
560 564
@@ -566,6 +570,8 @@ _spin_stop(Evas_Object *obj)
566 sd->interval = sd->first_interval; 570 sd->interval = sd->first_interval;
567 sd->spin_speed = 0; 571 sd->spin_speed = 0;
568 ELM_SAFE_FREE(sd->spin_timer, ecore_timer_del); 572 ELM_SAFE_FREE(sd->spin_timer, ecore_timer_del);
573
574 elm_widget_scroll_freeze_pop(obj);
569} 575}
570 576
571static Eina_Bool 577static Eina_Bool