[gnome-shell/wip/background-rework: 1/4] Main: move the stage hierarchy initialization to LayoutManager

[Ray Strode <halfline src gnome org>]

commit 4e3f0a5543a72da866adcfa18a5f0a174980fa7a
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Thu Jan 10 16:02:20 2013 -0500

    Main: move the stage hierarchy initialization to LayoutManager
    
    It is cleaner to concentrate all layout and chrome management
    in one place, instead of having it scattered around the codebase.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=682429

 js/ui/layout.js |   59 ++++++++++++++++++++++++++++++++++++++++++++----------
 js/ui/main.js   |   34 +++----------------------------
 js/ui/panel.js  |    2 +-
 3 files changed, 53 insertions(+), 42 deletions(-)
---
diff --git a/js/ui/layout.js b/js/ui/layout.js
index f55e2b3..eb909af 100644
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -18,6 +18,7 @@ const HOT_CORNER_ACTIVATION_TIMEOUT = 0.5;
 const STARTUP_ANIMATION_TIME = 0.2;
 const KEYBOARD_ANIMATION_TIME = 0.15;
 const PLYMOUTH_TRANSITION_TIME = 1;
+const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);
 
 const MonitorConstraint = new Lang.Class({
     Name: 'MonitorConstraint',
@@ -110,6 +111,42 @@ const LayoutManager = new Lang.Class({
         this._rightPanelBarrier = 0;
         this._trayBarrier = 0;
 
+        // Normally, the stage is always covered so Clutter doesn't need to clear
+        // it; however it becomes visible during the startup animation
+        // See the comment below for a longer explanation
+        global.stage.color = DEFAULT_BACKGROUND_COLOR;
+
+        // Set up stage hierarchy to group all UI actors under one container.
+        this.uiGroup = new Shell.GenericContainer({ name: 'uiGroup' });
+        this.uiGroup.connect('allocate',
+                        function (actor, box, flags) {
+                            let children = actor.get_children();
+                            for (let i = 0; i < children.length; i++)
+                                children[i].allocate_preferred_size(flags);
+                        });
+        this.uiGroup.connect('get-preferred-width',
+                        function(actor, forHeight, alloc) {
+                            let width = global.stage.width;
+                            [alloc.min_size, alloc.natural_size] = [width, width];
+                        });
+        this.uiGroup.connect('get-preferred-height',
+                        function(actor, forWidth, alloc) {
+                            let height = global.stage.height;
+                            [alloc.min_size, alloc.natural_size] = [height, height];
+                        });
+
+        global.window_group.reparent(this.uiGroup);
+
+        // Now, you might wonder why we went through all the hoops to implement
+        // the GDM greeter inside an X11 compositor, to do this at the end...
+        // However, hiding this is necessary to avoid showing the background during
+        // the initial animation, before Gdm.LoginDialog covers everything
+        if (Main.sessionMode.isGreeter)
+            global.window_group.hide();
+
+        global.overlay_group.reparent(this.uiGroup);
+        global.stage.add_child(this.uiGroup);
+
         this._chrome = new Chrome(this);
 
         this.screenShieldGroup = new St.Widget({ name: 'screenShieldGroup',
@@ -227,7 +264,7 @@ const LayoutManager = new Lang.Class({
             if (!haveTopLeftCorner)
                 continue;
 
-            let corner = new HotCorner();
+            let corner = new HotCorner(this);
             this._hotCorners.push(corner);
             corner.actor.set_position(cornerX, cornerY);
             this._chrome.addActor(corner.actor);
@@ -358,7 +395,7 @@ const LayoutManager = new Lang.Class({
         if (Main.sessionMode.isGreeter) {
             this._background = Meta.BackgroundActor.new_for_screen(global.screen);
             if (this._background != null) {
-                Main.uiGroup.add_actor(this._background);
+                this._layoutManager.add_actor(this._background);
                 Tweener.addTween(this._background,
                                  { opacity: 0,
                                    time: PLYMOUTH_TRANSITION_TIME,
@@ -529,7 +566,7 @@ Signals.addSignalMethods(LayoutManager.prototype);
 const HotCorner = new Lang.Class({
     Name: 'HotCorner',
 
-    _init : function() {
+    _init : function(layoutManager) {
         // We use this flag to mark the case where the user has entered the
         // hot corner and has not left both the hot corner and a surrounding
         // guard area (the "environs"). This avoids triggering the hot corner
@@ -583,9 +620,9 @@ const HotCorner = new Lang.Class({
         this._ripple2 = new St.BoxLayout({ style_class: 'ripple-box', opacity: 0, visible: false });
         this._ripple3 = new St.BoxLayout({ style_class: 'ripple-box', opacity: 0, visible: false });
 
-        Main.uiGroup.add_actor(this._ripple1);
-        Main.uiGroup.add_actor(this._ripple2);
-        Main.uiGroup.add_actor(this._ripple3);
+        layoutManager.uiGroup.add_actor(this._ripple1);
+        layoutManager.uiGroup.add_actor(this._ripple2);
+        layoutManager.uiGroup.add_actor(this._ripple3);
     },
 
     destroy: function() {
@@ -737,7 +774,7 @@ const Chrome = new Lang.Class({
     },
 
     addActor: function(actor, params) {
-        Main.uiGroup.add_actor(actor);
+        this._layoutManager.uiGroup.add_actor(actor);
         this._trackActor(actor, params);
     },
 
@@ -769,7 +806,7 @@ const Chrome = new Lang.Class({
     },
 
     removeActor: function(actor) {
-        Main.uiGroup.remove_actor(actor);
+        this._layoutManager.remove_actor(actor);
         this._untrackActor(actor);
     },
 
@@ -788,7 +825,7 @@ const Chrome = new Lang.Class({
 
         let actorData = Params.parse(params, defaultParams);
         actorData.actor = actor;
-        actorData.isToplevel = actor.get_parent() == Main.uiGroup;
+        actorData.isToplevel = actor.get_parent() == this._layoutManager.uiGroup;
         actorData.visibleId = actor.connect('notify::visible',
                                             Lang.bind(this, this._queueUpdateRegions));
         actorData.allocationId = actor.connect('notify::allocation',
@@ -824,7 +861,7 @@ const Chrome = new Lang.Class({
         } else {
             let i = this._findActor(actor);
             let actorData = this._trackedActors[i];
-            actorData.isToplevel = (newParent == Main.uiGroup);
+            actorData.isToplevel = (newParent == this._layoutManager.uiGroup);
         }
     },
 
@@ -1051,7 +1088,7 @@ const Chrome = new Lang.Class({
 
             if (actorData.affectsInputRegion &&
                 actorData.actor.get_paint_visibility() &&
-                !Main.uiGroup.get_skip_paint(actorData.actor))
+                !this._layoutManager.uiGroup.get_skip_paint(actorData.actor))
                 rects.push(rect);
 
             if (!actorData.affectsStruts)
diff --git a/js/ui/main.js b/js/ui/main.js
index f8235f6..c15b6da 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -38,7 +38,6 @@ const XdndHandler = imports.ui.xdndHandler;
 const Util = imports.misc.util;
 
 const OVERRIDES_SCHEMA = 'org.gnome.shell.overrides';
-const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);
 
 const KeybindingMode = {
     NONE:          0,       // block all keybindings
@@ -124,38 +123,13 @@ function start() {
 
     tracker.connect('startup-sequence-changed', _queueCheckWorkspaces);
 
-    // The stage is always covered so Clutter doesn't need to clear it; however
-    // the color is used as the default contents for the Mutter root background
-    // actor so set it anyways.
-    global.stage.color = DEFAULT_BACKGROUND_COLOR;
-    global.stage.no_clear_hint = true;
+    // Setup the stage hierarchy early
+    layoutManager = new Layout.LayoutManager();
+    // For backward compatibility
+    uiGroup = layoutManager.uiGroup;
 
     _defaultCssStylesheet = global.datadir + '/theme/gnome-shell.css';
     loadTheme();
-
-    // Set up stage hierarchy to group all UI actors under one container.
-    uiGroup = new Shell.GenericContainer({ name: 'uiGroup' });
-    uiGroup.connect('allocate',
-                    function (actor, box, flags) {
-                        let children = uiGroup.get_children();
-                        for (let i = 0; i < children.length; i++)
-                            children[i].allocate_preferred_size(flags);
-                    });
-    uiGroup.connect('get-preferred-width',
-                    function(actor, forHeight, alloc) {
-                        let width = global.stage.width;
-                        [alloc.min_size, alloc.natural_size] = [width, width];
-                    });
-    uiGroup.connect('get-preferred-height',
-                    function(actor, forWidth, alloc) {
-                        let height = global.stage.height;
-                        [alloc.min_size, alloc.natural_size] = [height, height];
-                    });
-    global.window_group.reparent(uiGroup);
-    global.overlay_group.reparent(uiGroup);
-    global.stage.add_actor(uiGroup);
-
-    layoutManager = new Layout.LayoutManager();
     xdndHandler = new XdndHandler.XdndHandler();
     ctrlAltTabManager = new CtrlAltTab.CtrlAltTabManager();
     overview = new Overview.Overview();
diff --git a/js/ui/panel.js b/js/ui/panel.js
index dada027..0488ecf 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -644,7 +644,7 @@ const ActivitiesButton = new Lang.Class({
 
         this.actor.label_actor = this._label;
 
-        this.hotCorner = new Layout.HotCorner();
+        this.hotCorner = new Layout.HotCorner(Main.layoutManager);
         container.add_actor(this.hotCorner.actor);
 
         this.actor.connect('captured-event', Lang.bind(this, this._onCapturedEvent));