be more aggressive about exiting zoom effect

CCBUG: 289336
REVIEW: 115453
This commit is contained in:
Thomas Lübking 2014-02-03 21:03:26 +01:00
parent acaf4807ab
commit 68fc751916

View file

@ -398,7 +398,7 @@ void ZoomEffect::zoomOut()
{
source_zoom = zoom;
target_zoom /= zoomFactor;
if (target_zoom < 1) {
if ((zoomFactor > 1 && target_zoom < 1.01) || (zoomFactor < 1 && target_zoom > 0.99)) {
target_zoom = 1;
if (polling) {
polling = false;