From b1654af406327290ed3b9ef9fce39b51230e4e16 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Thu, 24 Feb 2011 11:21:30 +0100
Subject: [PATCH] Fix positioning of panel on startup

We need to do the initial relayout before we start up the startup
animation, and the startup animation can't hardcode the position
of the panel to zero.

https://bugzilla.gnome.org/show_bug.cgi?id=642881
---
 js/ui/main.js  | 6 +++---
 js/ui/panel.js | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/js/ui/main.js b/js/ui/main.js
index a79841454..3d3d87c14 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -196,6 +196,9 @@ function start() {
     ExtensionSystem.init();
     ExtensionSystem.loadExtensions();
 
+    // Perform initial relayout here
+    _relayout();
+
     panel.startStatusArea();
     panel.startupAnimation();
 
@@ -204,9 +207,6 @@ function start() {
 
     global.stage.connect('captured-event', _globalKeyPressHandler);
 
-    // Perform initial relayout here
-    _relayout();
-
     _log('info', 'loaded at ' + _startDate);
     log('GNOME Shell started at ' + _startDate);
 
diff --git a/js/ui/panel.js b/js/ui/panel.js
index 92272df98..1d1e10d60 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -1042,9 +1042,10 @@ Panel.prototype = {
     },
 
     startupAnimation: function() {
-        this.actor.y = -this.actor.height;
+        let oldY = this.actor.y;
+        this.actor.y = oldY - this.actor.height;
         Tweener.addTween(this.actor,
-                         { y: 0,
+                         { y: oldY,
                            time: 0.2,
                            transition: 'easeOutQuad'
                          });