~townsend/compiz/fix-auto-vp-switch-0.9.10

Viewing changes to plugins/expo/src/wall_offset/src/wall-offset.cpp

Committer: Chris Townsend
Date: 2013-08-21 19:59:10 UTC
mto: This revision was merged to the branch mainline in revision 3783.
Revision ID: christopher.townsend@canonical.com-20130821195910-rfvh9j8c1h21q2tk

Removed logic in the calculateWallOffset() function in the Expo plugin that only accounted for offsetting the expo animation on the left-most and top-most monitor.
Also removed the TestNoOffsetIfOutputIsNotOrigin test since this test is now invalid.

files modified:
plugins/expo/src/wall_offset/src/wall-offset.cpp

plugins/expo/src/wall_offset/tests/test-expo-wall-offset.cpp

Show diffs side-by-side

added added

removed removed

plugins/expo/src/wall_offset/src/wall-offset.cpp

worldScaleFactorX = 1.0f;

worldScaleFactorY = 1.0f;

if (output.left () == 0)

{

offsetInWorldX = ((vpSize.x () * sx) / ((float) output.width ()) * (offsetInScreenCoords.x ()) * animationProgress);

worldScaleFactorX = 1.0f - ((float) (offsetInScreenCoords.x ()) / (float) (output.width ())) * animationProgress;

}

offsetInWorldX = ((vpSize.x () * sx) / ((float) output.width ()) * (offsetInScreenCoords.x ()) * animationProgress);

worldScaleFactorX = 1.0f - ((float) (offsetInScreenCoords.x ()) / (float) (output.width ())) * animationProgress;

if (output.top () == 0)

{

offsetInWorldY = ((vpSize.y () * sy) / ((float) output.height ()) * (offsetInScreenCoords.y ()) * animationProgress);

worldScaleFactorY = 1.0f - ((float) (offsetInScreenCoords.y ()) / (float) output.height ()) * animationProgress;

}

offsetInWorldY = ((vpSize.y () * sy) / ((float) output.height ()) * (offsetInScreenCoords.y ()) * animationProgress);

worldScaleFactorY = 1.0f - ((float) (offsetInScreenCoords.y ()) / (float) output.height ()) * animationProgress;

}

Older »