~3v1n0/compiz/gtk-decorator-finalize-menu-0.9.10

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

Committer: Tarmac
Author(s): Chris Townsend
Date: 2013-08-26 17:33:56 UTC
mfrom: (3781.2.1 compiz-0.9.10)
Revision ID: tarmac-20130826173356-g2xwubc1e8ypored

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. Fixes: https://bugs.launchpad.net/bugs/1031710.

Approved by Brandon Schaefer, PS Jenkins bot.

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 »