screensaver: Limit access to the screenShieldGroup.

It shouldn't be accessible outside of screensaver code.

Author: mtwebster

js/ui/layout.js

@@ -304,20 +304,6 @@ var LayoutManager = GObject.registerClass({
         this._chrome.init();
 
         this.hotCornerManager = new HotCorner.HotCornerManager();
-
-        // Create container for screen shield (above all other UI)
-        this.screenShieldGroup = new St.Widget({
-            name: 'screenShieldGroup',
-            visible: false,
-            clip_to_allocation: true,
-            layout_manager: new Clutter.BinLayout()
-        });
-        this.screenShieldGroup.add_constraint(new Clutter.BindConstraint({
-            source: global.stage,
-            coordinate: Clutter.BindCoordinate.ALL
-        }));
-        global.stage.add_actor(this.screenShieldGroup);
-        this.screenShieldGroup.raise_top();
     }
 
     _toggleExpo() {

js/ui/main.js

@@ -552,7 +552,19 @@ function start() {
     // The internal screensaver is the only option for wayland sessions. X11 sessions can use either
     // the internal one or cinnamon-screensaver (>= 6.7).
     if (Meta.is_wayland_compositor() || global.settings.get_boolean('internal-screensaver-enabled')) {
-        _screenShield = new ScreenShield.ScreenShield();
+        let screenShieldGroup = new St.Widget({
+            name: 'screenShieldGroup',
+            visible: false,
+            clip_to_allocation: true,
+            layout_manager: new Clutter.BinLayout()
+        });
+        screenShieldGroup.add_constraint(new Clutter.BindConstraint({
+            source: global.stage,
+            coordinate: Clutter.BindCoordinate.ALL
+        }));
+        global.stage.add_actor(screenShieldGroup);
+
+        _screenShield = new ScreenShield.ScreenShield(screenShieldGroup);
         new ScreenSaver.ScreenSaverService(_screenShield);
     }
 

js/ui/screensaver/screenShield.js

@@ -92,7 +92,7 @@ var ScreenShield = GObject.registerClass({
         'unlocked': {}
     }
 }, class ScreenShield extends St.Widget {
-    _init() {
+    _init(screenShieldGroup) {
         super._init({
             name: 'screenShield',
             style_class: 'screen-shield',
@@ -143,7 +143,8 @@ var ScreenShield = GObject.registerClass({
         });
         this.add_constraint(constraint);
 
-        Main.layoutManager.screenShieldGroup.add_actor(this);
+        this._screenShieldGroup = screenShieldGroup;
+        this._screenShieldGroup.add_actor(this);
 
         this._backgroundLayer = new St.Widget({
             name: 'screenShieldBackground',
@@ -457,8 +458,8 @@ var ScreenShield = GObject.registerClass({
             if (Main.deskletContainer)
                 Main.deskletContainer.actor.hide();
 
-            global.stage.set_child_above_sibling(Main.layoutManager.screenShieldGroup, null);
-            Main.layoutManager.screenShieldGroup.show();
+            global.stage.set_child_above_sibling(this._screenShieldGroup, null);
+            this._screenShieldGroup.show();
             this.show();
 
             if (immediate) {
@@ -494,7 +495,7 @@ var ScreenShield = GObject.registerClass({
             if (Main.deskletContainer)
                 Main.deskletContainer.actor.show();
 
-            Main.layoutManager.screenShieldGroup.hide();
+            this._screenShieldGroup.hide();
             this.hide();
             this._destroyBackgrounds();
 
@@ -578,7 +579,7 @@ var ScreenShield = GObject.registerClass({
             onComplete: () => {
                 Main.popModal(this);
                 this.hide();
-                Main.layoutManager.screenShieldGroup.hide();
+                this._screenShieldGroup.hide();
                 this._destroyAllWidgets();
                 global.stage.show_cursor();