[gnome-shell/gbsneto/new-lock-screen-part2: 23/32] unlockDialog: Move auth prompt and clock to a ShellStack

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit 48b7dd5af340f75dc8ea904c59ca28b2e1d8590d
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Fri Nov 29 14:36:01 2019 -0300

    unlockDialog: Move auth prompt and clock to a ShellStack
    
    We will toggle between each other in the next commit, so add
    both to a ShellStack.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872

 js/ui/unlockDialog.js | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)
---
diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index e45e25e3e4..e8644afd5d 100644
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -321,19 +321,19 @@ class UnlockDialogClock extends St.BoxLayout {
 
 var UnlockDialogLayout = GObject.registerClass(
 class UnlockDialogLayout extends Clutter.LayoutManager {
-    _init(authBox, notifications) {
+    _init(stack, notifications) {
         super._init();
 
-        this._authBox = authBox;
+        this._stack = stack;
         this._notifications = notifications;
     }
 
     vfunc_get_preferred_width(container, forHeight) {
-        return this._authBox.get_preferred_width(forHeight);
+        return this._stack.get_preferred_width(forHeight);
     }
 
     vfunc_get_preferred_height(container, forWidth) {
-        return this._authBox.get_preferred_height(forWidth);
+        return this._stack.get_preferred_height(forWidth);
     }
 
     vfunc_allocate(container, box, flags) {
@@ -342,13 +342,13 @@ class UnlockDialogLayout extends Clutter.LayoutManager {
         let tenthOfHeight = height / 10.0;
         let thirdOfHeight = height / 3.0;
 
-        let [, , authBoxWidth, authBoxHeight] =
-            this._authBox.get_preferred_size();
+        let [, , stackWidth, stackHeight] =
+            this._stack.get_preferred_size();
 
         let [, , notificationsWidth, notificationsHeight] =
             this._notifications.get_preferred_size();
 
-        let columnWidth = Math.max(authBoxWidth, notificationsWidth);
+        let columnWidth = Math.max(stackWidth, notificationsWidth);
 
         let columnX1 = Math.floor(width / 2.0 - columnWidth / 2.0);
         let actorBox = new Clutter.ActorBox();
@@ -356,7 +356,7 @@ class UnlockDialogLayout extends Clutter.LayoutManager {
         // Notifications
         let maxNotificationsHeight = Math.min(
             notificationsHeight,
-            height - tenthOfHeight - authBoxHeight);
+            height - tenthOfHeight - stackHeight);
 
         actorBox.x1 = columnX1;
         actorBox.y1 = height - maxNotificationsHeight;
@@ -366,16 +366,16 @@ class UnlockDialogLayout extends Clutter.LayoutManager {
         this._notifications.allocate(actorBox, flags);
 
         // Authentication Box
-        let authBoxY = Math.min(
+        let stackY = Math.min(
             thirdOfHeight,
-            height - authBoxHeight - maxNotificationsHeight);
+            height - stackHeight - maxNotificationsHeight);
 
         actorBox.x1 = columnX1;
-        actorBox.y1 = authBoxY;
+        actorBox.y1 = stackY;
         actorBox.x2 = columnX1 + columnWidth;
-        actorBox.y2 = authBoxY + authBoxHeight;
+        actorBox.y2 = stackY + stackHeight;
 
-        this._authBox.allocate(actorBox, flags);
+        this._stack.allocate(actorBox, flags);
     }
 });
 
@@ -408,10 +408,15 @@ var UnlockDialog = GObject.registerClass({
         this._userName = GLib.get_user_name();
         this._user = this._userManager.get_user(this._userName);
 
+        // Authentication & Clock stack
+        let stack = new Shell.Stack();
+
         this._promptBox = new St.BoxLayout({ vertical: true });
+        stack.add_child(this._promptBox);
 
         this._clock = new Clock();
-        this._promptBox.add_child(this._clock);
+        stack.add_child(this._clock);
+        this._showClock();
 
         this._authPrompt = new AuthPrompt.AuthPrompt(new Gdm.Client(), 
AuthPrompt.AuthPromptMode.UNLOCK_ONLY);
         this._authPrompt.connect('failed', this._fail.bind(this));
@@ -452,10 +457,10 @@ var UnlockDialog = GObject.registerClass({
         // Main Box
         let mainBox = new Clutter.Actor();
         mainBox.add_constraint(new Layout.MonitorConstraint({ primary: true }));
-        mainBox.add_child(this._promptBox);
+        mainBox.add_child(stack);
         mainBox.add_child(this._notificationsBox);
         mainBox.layout_manager = new UnlockDialogLayout(
-            this._promptBox,
+            stack,
             this._notificationsBox);
         this.add_child(mainBox);