summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorJaehwan Kim <jae.hwan.kim@samsung.com>2011-10-26 05:51:59 +0000
committerCarsten Haitzler <raster@rasterman.com>2011-10-26 05:51:59 +0000
commit12711f6f63ae734e4024bee933a532e177362d3c (patch)
tree86cc30ae02803bc88c4d407ce7da6cefd813fd82 /legacy
parentdc180b67ce73367f6d63a6719b2369da2d5d2b37 (diff)
From: Jaehwan Kim <jae.hwan.kim@samsung.com>
I found a problem in els_scroller. When the scroller is resized, it shows the location of the coordination which was saved into wanted_coordination. If you don't use the page, it is no matter. But if you use the page function, the animation of the scroller is operated by _smart_scrollto_x_animator, not by _smart_momentum_animator. In _smart_scrollto_x_animator, therer isn't _update_wanted_coordinates. So the value of wanted_coordination doesn't update. I think _update_wanted_coordinates have to be added in _smart_scrollto_x_animator and _smart_scrollto_y_animator. Please check the attached patch file. SVN revision: 64406
Diffstat (limited to 'legacy')
-rw-r--r--legacy/elementary/src/lib/els_scroller.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/legacy/elementary/src/lib/els_scroller.c b/legacy/elementary/src/lib/els_scroller.c
index f774a9cd4f..a769eba0e0 100644
--- a/legacy/elementary/src/lib/els_scroller.c
+++ b/legacy/elementary/src/lib/els_scroller.c
@@ -458,12 +458,14 @@ _smart_scrollto_x_animator(void *data)
458 { 458 {
459 px = sd->scrollto.x.end; 459 px = sd->scrollto.x.end;
460 elm_smart_scroller_child_pos_set(sd->smart_obj, px, py); 460 elm_smart_scroller_child_pos_set(sd->smart_obj, px, py);
461 _update_wanted_coordinates(sd, px, py);
461 sd->scrollto.x.animator = NULL; 462 sd->scrollto.x.animator = NULL;
462 if ((!sd->scrollto.y.animator) && (!sd->down.bounce_y_animator)) 463 if ((!sd->scrollto.y.animator) && (!sd->down.bounce_y_animator))
463 _smart_anim_stop(sd->smart_obj); 464 _smart_anim_stop(sd->smart_obj);
464 return ECORE_CALLBACK_CANCEL; 465 return ECORE_CALLBACK_CANCEL;
465 } 466 }
466 elm_smart_scroller_child_pos_set(sd->smart_obj, px, py); 467 elm_smart_scroller_child_pos_set(sd->smart_obj, px, py);
468 _update_wanted_coordinates(sd, px, py);
467 return ECORE_CALLBACK_RENEW; 469 return ECORE_CALLBACK_RENEW;
468} 470}
469 471
@@ -548,12 +550,14 @@ _smart_scrollto_y_animator(void *data)
548 { 550 {
549 py = sd->scrollto.y.end; 551 py = sd->scrollto.y.end;
550 elm_smart_scroller_child_pos_set(sd->smart_obj, px, py); 552 elm_smart_scroller_child_pos_set(sd->smart_obj, px, py);
553 _update_wanted_coordinates(sd, px, py);
551 sd->scrollto.y.animator = NULL; 554 sd->scrollto.y.animator = NULL;
552 if ((!sd->scrollto.x.animator) && (!sd->down.bounce_x_animator)) 555 if ((!sd->scrollto.x.animator) && (!sd->down.bounce_x_animator))
553 _smart_anim_stop(sd->smart_obj); 556 _smart_anim_stop(sd->smart_obj);
554 return ECORE_CALLBACK_CANCEL; 557 return ECORE_CALLBACK_CANCEL;
555 } 558 }
556 elm_smart_scroller_child_pos_set(sd->smart_obj, px, py); 559 elm_smart_scroller_child_pos_set(sd->smart_obj, px, py);
560 _update_wanted_coordinates(sd, px, py);
557 561
558 return ECORE_CALLBACK_RENEW; 562 return ECORE_CALLBACK_RENEW;
559} 563}