From 23abe4eb221f13d5fdbf1f044c51d7a96204ae72 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Mon, 7 Oct 2019 16:54:07 -0300 Subject: [PATCH] screenShield: Translate the dialog group Instead of the screen lock group, which is now empty and soon will be removed. --- js/ui/screenShield.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js index f37ad346c..83e4aec0b 100644 --- a/js/ui/screenShield.js +++ b/js/ui/screenShield.js @@ -601,8 +601,6 @@ var ScreenShield = class { return; this._ensureLockScreen(); - this._lockDialogGroup.scale_x = 1; - this._lockDialogGroup.scale_y = 1; this._lockScreenGroup.show(); this._lockScreenState = MessageTray.State.SHOWING; @@ -610,10 +608,10 @@ var ScreenShield = class { let fadeToBlack = params.fadeToBlack; if (params.animateLockScreen) { - this._lockScreenGroup.y = -global.screen_height; - this._lockScreenGroup.remove_all_transitions(); - this._lockScreenGroup.ease({ - y: 0, + this._lockDialogGroup.translation_y = -global.screen_height; + this._lockDialogGroup.remove_all_transitions(); + this._lockDialogGroup.ease({ + translation_y: 0, duration: MANUAL_FADE_TIME, mode: Clutter.AnimationMode.EASE_OUT_QUAD, onComplete: () => { @@ -754,9 +752,8 @@ var ScreenShield = class { } this._lockDialogGroup.ease({ - scale_x: 0, - scale_y: 0, - duration: animate ? Overview.ANIMATION_TIME : 0, + translation_y: -global.screen_height, + duration: CURTAIN_SLIDE_TIME, mode: Clutter.AnimationMode.EASE_OUT_QUAD, onComplete: () => this._completeDeactivate() });