From 40400167b9db87c98952dfc7996e9cc50a294bb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Sun, 25 Nov 2012 19:00:31 +0100 Subject: [PATCH] Only wrap duration once in animationTime() The zoomDuration is already wrapped in animationTime() during reconfigure. So doing it twice is wrong. REVIEW: 107463 --- effects/desktopgrid/desktopgrid.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/effects/desktopgrid/desktopgrid.cpp b/effects/desktopgrid/desktopgrid.cpp index 71de001575..65dae766e0 100644 --- a/effects/desktopgrid/desktopgrid.cpp +++ b/effects/desktopgrid/desktopgrid.cpp @@ -1071,7 +1071,7 @@ void DesktopGridEffect::setup() qDeleteAll(hoverTimeline); hoverTimeline.clear(); for (int i = 0; i < effects->numberOfDesktops(); i++) { - QTimeLine *newTimeline = new QTimeLine(animationTime(zoomDuration), this); + QTimeLine *newTimeline = new QTimeLine(zoomDuration, this); newTimeline->setCurveShape(QTimeLine::EaseInOutCurve); hoverTimeline.append(newTimeline); } @@ -1292,7 +1292,7 @@ void DesktopGridEffect::desktopsAdded(int old) const int desktop = effects->numberOfDesktops(); for (int i = old; i <= effects->numberOfDesktops(); i++) { // add a timeline for the new desktop - QTimeLine *newTimeline = new QTimeLine(animationTime(zoomDuration), this); + QTimeLine *newTimeline = new QTimeLine(zoomDuration, this); newTimeline->setCurveShape(QTimeLine::EaseInOutCurve); hoverTimeline.append(newTimeline); }