[gnome-shell/gbsneto/new-lock-screen: 7/22] screenShield: Cleanup lock screen handling



commit 137df4bc26a07e579668ac80a1b58802ec018e79
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Mon Oct 7 16:57:16 2019 -0300

    screenShield: Cleanup lock screen handling

 js/ui/screenShield.js | 34 +---------------------------------
 1 file changed, 1 insertion(+), 33 deletions(-)
---
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 83e4aec0b7..739f601e9d 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -155,7 +155,6 @@ var ScreenShield = class {
         this._lockSettings.connect(`changed::${DISABLE_LOCK_KEY}`, this._syncInhibitor.bind(this));
 
         this._isModal = false;
-        this._hasLockScreen = false;
         this._isGreeter = false;
         this._isActive = false;
         this._isLocked = false;
@@ -600,7 +599,7 @@ var ScreenShield = class {
         if (this._lockScreenState != MessageTray.State.HIDDEN)
             return;
 
-        this._ensureLockScreen();
+        this._ensureUnlockDialog(false, false);
 
         this._lockScreenGroup.show();
         this._lockScreenState = MessageTray.State.SHOWING;
@@ -671,34 +670,6 @@ var ScreenShield = class {
         this.emit('lock-screen-shown');
     }
 
-    // Some of the actors in the lock screen are heavy in
-    // resources, so we only create them when needed
-    _ensureLockScreen() {
-        if (this._hasLockScreen)
-            return;
-
-        this._lockScreenContentsBox = new St.BoxLayout({ x_align: Clutter.ActorAlign.CENTER,
-                                                         y_align: Clutter.ActorAlign.CENTER,
-                                                         x_expand: true,
-                                                         y_expand: true,
-                                                         vertical: true,
-                                                         style_class: 'screen-shield-contents-box' });
-
-        this._lockScreenContents.add_actor(this._lockScreenContentsBox);
-
-        this._hasLockScreen = true;
-    }
-
-    _wakeUpScreen() {
-        this._onUserBecameActive();
-        this.emit('wake-up-screen');
-    }
-
-    _clearLockScreen() {
-        this._lockScreenContentsBox.destroy();
-
-        this._hasLockScreen = false;
-    }
 
     get locked() {
         return this._isLocked;
@@ -722,9 +693,6 @@ var ScreenShield = class {
     _continueDeactivate(animate) {
         this._hideLockScreen(animate, 0);
 
-        if (this._hasLockScreen)
-            this._clearLockScreen();
-
         if (Main.sessionMode.currentMode == 'lock-screen')
             Main.sessionMode.popMode('lock-screen');
         if (Main.sessionMode.currentMode == 'unlock-dialog')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]