From 73d9ac6c017d3928d9bf78ce6ea476b871b5026a Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Mon, 18 Feb 2013 00:17:56 -0500
Subject: [PATCH] overviewControls: synchronize viewSelector fade and controls
 slide

If the animation time is not the same for these two, the translation
will be adjusted to the allocation during the tween, resulting in a jump
in the animation.

https://bugzilla.gnome.org/show_bug.cgi?id=694035
---
 js/ui/overviewControls.js | 2 +-
 js/ui/viewSelector.js     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js
index 4800f4f6a..f1e06873a 100644
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -9,7 +9,7 @@ const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
 const ViewSelector = imports.ui.viewSelector;
 
-const SIDE_CONTROLS_ANIMATION_TIME = 0.2;
+const SIDE_CONTROLS_ANIMATION_TIME = 0.16;
 
 function getRtlSlideDirection(direction, actor) {
     let rtl = (actor.text_direction == Clutter.TextDirection.RTL);
diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index a32ee7f8c..48b3e3b70 100644
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -215,7 +215,7 @@ const ViewSelector = new Lang.Class({
         this._activePage.show();
         Tweener.addTween(this._activePage,
             { opacity: 255,
-              time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME / 2,
+              time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME,
               transition: 'easeOutQuad'
             });
     },
@@ -231,7 +231,7 @@ const ViewSelector = new Lang.Class({
         if (oldPage && !noFade)
             Tweener.addTween(oldPage,
                              { opacity: 0,
-                               time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME / 2,
+                               time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME,
                                transition: 'easeOutQuad',
                                onComplete: Lang.bind(this,
                                    function() {