equal
deleted
inserted
replaced
434 { |
434 { |
435 mScrollDirection = Qt::Horizontal; |
435 mScrollDirection = Qt::Horizontal; |
436 mNextScrollDirection = mScrollDirection; |
436 mNextScrollDirection = mScrollDirection; |
437 return; |
437 return; |
438 } |
438 } |
439 |
439 |
440 if (mScrollDirection != scrollDirection) |
440 if (mScrollDirection != scrollDirection) |
441 { |
441 { |
442 mStateMachine->setAnimated(animate); |
442 mStateMachine->setAnimated(animate); |
443 mNextScrollDirection = scrollDirection; |
443 mNextScrollDirection = scrollDirection; |
444 |
444 |
447 } |
447 } |
448 else |
448 else |
449 { |
449 { |
450 //emit renderingNeeded(); |
450 //emit renderingNeeded(); |
451 } |
451 } |
452 } else if (!animate) { |
452 } else { |
453 // reset next scrolldirection just to be sure. In some cases |
453 // reset next scrolldirection just to be sure. In some cases |
454 // when orientation changes couple of times and container visibility changes |
454 // when orientation changes couple of times and container visibility changes |
455 // we might otherwise end up in wrong state. |
455 // we might otherwise end up in wrong state. |
456 mNextScrollDirection = scrollDirection; |
456 mNextScrollDirection = scrollDirection; |
457 } |
457 } |