← Back to branch summary

~ubuntu-branches/ubuntu/trusty/compiz/trusty

« back to all changes in this revision

Viewing changes to plugins/animation/src/dodge.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2013-08-22 06:58:07 UTC
  • mto: This revision was merged to the branch mainline in revision 3352.
  • Revision ID: package-import@ubuntu.com-20130822065807-17nlzez0d30y09so
Tags: upstream-0.9.10+13.10.20130822
Import upstream version 0.9.10+13.10.20130822

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/animation/src/dodge.cpp
517
517
            AnimEffectDodge)
518
518
            nonMatching = true;
519
519
 
520
 
        numSelectedCandidates++;
 
520
        ++numSelectedCandidates;
521
521
        DodgePersistentData *data = static_cast<DodgePersistentData *>
522
522
            (aCandidateWin->persistentData["dodge"]);
523
523
        data->dodgeOrder = numSelectedCandidates;
696
696
 
697
697
        int dodgeAmount[4];
698
698
 
699
 
        for (int i = 0; i < 4; i++)
 
699
        for (int i = 0; i < 4; ++i)
700
700
            dodgeAmount[i] =
701
701
                DodgeAnim::getDodgeAmount (subjectRect, dw, (DodgeDirection)i);
702
702
 
703
703
        int amountMinActual = dodgeAmount[0];
704
704
        int amountMinAbs = abs (amountMinActual);
705
705
        int iMin = 0;
706
 
        for (int i=1; i<4; i++)
 
706
        for (int i=1; i < 4; ++i)
707
707
        {
708
708
            int absAmount = abs (dodgeAmount[i]);
709
709
            if (amountMinAbs > absAmount)