← Back to branch summary

~3v1n0/compiz/resize-lowgfx-fixes

« back to all changes in this revision

Viewing changes to plugins/scale/src/scale.cpp

  • Committer: BryanFRitt
  • Date: 2016-07-14 15:43:48 UTC
  • mfrom: (4067 compiz)
  • mto: This revision was merged to the branch mainline in revision 4075.
  • Revision ID: bryanfritt@hotmail.com-20160714154348-sit21cmf3dzpfkpn
ran `bzr merge lp:compiz`

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/scale/src/scale.cpp
932
932
    if (state != ScaleScreen::Idle && state != ScaleScreen::Wait)
933
933
    {
934
934
        int   steps;
935
 
        float amount, chunk;
936
 
 
937
 
        amount = msSinceLastPaint * 0.05f * optionGetSpeed ();
 
935
        float amount, chunk, speed;
 
936
 
 
937
        speed = optionGetSkipAnimation() ? USHRT_MAX : optionGetSpeed();
 
938
 
 
939
        amount = msSinceLastPaint * 0.05f * speed;
938
940
        steps  = amount / (0.5f * optionGetTimestep ());
939
941
 
940
942
        if (!steps)