gnome-shell r102 - trunk/js/ui

[otaylor svn gnome org]

Author: otaylor
Date: Mon Dec  1 22:43:06 2008
New Revision: 102
URL: http://svn.gnome.org/viewvc/gnome-shell?rev=102&view=rev

Log:
Slide in the sidebar as the overlay appears

appdisplay.js: Add AppDisplay.actor property, remove the x/y parameters
  to the constructor, and don't automatically add the appdisplay
  to the stage.

overlay.js: Make the AppDisplay a child of the SideShow, rename
  SideShow._grid to SideShow.actor and slide the SideShow in when
  showing the stage.

http://bugzilla.gnome.org/show_bug.cgi?id=562920

Modified:
   trunk/js/ui/appdisplay.js
   trunk/js/ui/overlay.js

Modified: trunk/js/ui/appdisplay.js
==============================================================================
--- trunk/js/ui/appdisplay.js	(original)
+++ trunk/js/ui/appdisplay.js	Mon Dec  1 22:43:06 2008
@@ -124,17 +124,15 @@
 
 Signals.addSignalMethods(AppDisplayItem.prototype);
 
-function AppDisplay(x, y, width, height) {
-    this._init(x, y, width, height);
+function AppDisplay(width, height) {
+    this._init(width, height);
 }
 
 AppDisplay.prototype = {
-    _init : function(x, y, width, height) {
+    _init : function(width, height) {
         let me = this;
         let global = Shell.Global.get();
         this._search = '';
-        this._x = x;
-        this._y = y;
         this._width = width;
         this._height = height;
         this._appmonitor = new Shell.AppMonitor();
@@ -142,12 +140,12 @@
         this._appmonitor.connect('changed', function(mon) {
             me._appsStale = true;
         });
-        this._grid = new Tidy.Grid({x: x, y: y, width: width, height: height});
-        global.stage.add_actor(this._grid);
+        this._grid = new Tidy.Grid({width: width, height: height});
         this._appset = {}; // Map<appid, appinfo>
         this._displayed = {}; // Map<appid, AppDisplay>
         this._selectedIndex = -1;
         this._max_items = this._height / (APPDISPLAY_HEIGHT + APPDISPLAY_PADDING);
+        this.actor = this._grid;
     },
 
     _refreshCache: function() {

Modified: trunk/js/ui/overlay.js
==============================================================================
--- trunk/js/ui/overlay.js	(original)
+++ trunk/js/ui/overlay.js	Mon Dec  1 22:43:06 2008
@@ -55,22 +55,22 @@
         let me = this;
 
         let global = Shell.Global.get();
-        this._group = new Clutter.Group();
-        this._group.hide();
-        global.stage.add_actor(this._group);
+        this.actor = new Clutter.Group();
+        this.actor.hide();
+        global.stage.add_actor(this.actor);
         let icontheme = Gtk.IconTheme.get_default();
         let rect = new Clutter.Rectangle({ color: SIDESHOW_SEARCH_BG_COLOR,
                                              x: SIDESHOW_PAD,
                                              y: Panel.PANEL_HEIGHT + SIDESHOW_PAD,
                                              width: width,
                                              height: 24});
-        this._group.add_actor(rect);
+        this.actor.add_actor(rect);
 
         let searchIconTexture = new Clutter.Texture({ x: SIDESHOW_PAD + 2,
                                                       y: rect.y + 2 });
         let searchIconPath = icontheme.lookup_icon('gtk-find', 16, 0).get_filename();
         searchIconTexture.set_from_file(searchIconPath);
-        this._group.add_actor(searchIconTexture);
+        this.actor.add_actor(searchIconTexture);
 
         this._searchEntry = new Clutter.Entry({
                                              font_name: "Sans 14px",
@@ -79,7 +79,7 @@
                                              y: searchIconTexture.y,
                                              width: rect.width - (searchIconTexture.x),
                                              height: searchIconTexture.height});
-        this._group.add_actor(this._searchEntry);
+        this.actor.add_actor(this._searchEntry);
         global.stage.set_key_focus(this._searchEntry);
         this._searchQueued = false;
         this._searchActive = false;
@@ -116,11 +116,13 @@
                                            x: SIDESHOW_PAD,
                                            y: this._searchEntry.y + this._searchEntry.height + 10,
                                            height: 16});
-        this._group.add_actor(appsText);
+        this.actor.add_actor(appsText);
 
         let menuY = appsText.y + appsText.height + 6;
-        this._appdisplay = new AppDisplay.AppDisplay(SIDESHOW_PAD,
-                menuY, width, global.screen_height - menuY);
+        this._appdisplay = new AppDisplay.AppDisplay(width, global.screen_height - menuY);
+        this._appdisplay.actor.x = SIDESHOW_PAD;
+        this._appdisplay.actor.y = menuY;
+        this.actor.add_actor(this._appdisplay.actor);
 
         /* Proxy the activated signal */
         this._appdisplay.connect('activated', function(appdisplay) {
@@ -129,12 +131,12 @@
     },
 
     show: function() {
-          this._group.show();
+          this.actor.show();
           this._appdisplay.show();
     },
 
     hide: function() {
-          this._group.hide();
+          this.actor.hide();
           this._appdisplay.hide();
     }
 };
@@ -240,6 +242,14 @@
         }
 
         this._sideshow.show();
+        // Slide in the sidebar as if it was attached to the left
+        // edge of the desktop as it shrinks down
+        this._sideshow.actor.x = - this._sideshow.actor.width;
+        Tweener.addTween(this._sideshow.actor,
+                         { x: 0,
+                           time: ANIMATION_TIME,
+                           transition: "easeOutQuad"
+                         });
 
         // All the the actors in the window group are completely obscured,
         // hiding the group holding them while the overlay is displayed greatly