|
 |
9b660f |
From d6ead50fe230df58ddab822966d69760b00ec920 Mon Sep 17 00:00:00 2001
|
|
|
9b660f |
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
|
|
|
9b660f |
Date: Wed, 1 Apr 2020 14:48:10 +0200
|
|
|
9b660f |
Subject: [PATCH 1/2] screenShield: Switch lightboxes off before unlock
|
|
|
9b660f |
transition
|
|
|
9b660f |
|
|
|
9b660f |
There is no point in animating a transition with fullscreen black
|
|
|
9b660f |
rectangles stacked on top, so switch them off before rather than
|
|
|
9b660f |
after the transition.
|
|
|
9b660f |
|
|
|
9b660f |
https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1158
|
|
|
9b660f |
---
|
|
|
9b660f |
js/ui/screenShield.js | 5 +++--
|
|
|
9b660f |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
9b660f |
|
|
|
9b660f |
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
|
|
|
9b660f |
index cd38f11fc8..282f29fa30 100644
|
|
|
9b660f |
--- a/js/ui/screenShield.js
|
|
|
9b660f |
+++ b/js/ui/screenShield.js
|
|
|
9b660f |
@@ -1221,6 +1221,9 @@ var ScreenShield = class {
|
|
|
9b660f |
this._isModal = false;
|
|
|
9b660f |
}
|
|
|
9b660f |
|
|
|
9b660f |
+ this._longLightbox.hide();
|
|
|
9b660f |
+ this._shortLightbox.hide();
|
|
|
9b660f |
+
|
|
|
9b660f |
Tweener.addTween(this._lockDialogGroup, {
|
|
|
9b660f |
scale_x: 0,
|
|
|
9b660f |
scale_y: 0,
|
|
|
9b660f |
@@ -1237,8 +1240,6 @@ var ScreenShield = class {
|
|
|
9b660f |
this._dialog = null;
|
|
|
9b660f |
}
|
|
|
9b660f |
|
|
|
9b660f |
- this._longLightbox.hide();
|
|
|
9b660f |
- this._shortLightbox.hide();
|
|
|
9b660f |
this.actor.hide();
|
|
|
9b660f |
|
|
|
9b660f |
if (this._becameActiveId != 0) {
|
|
|
9b660f |
--
|
|
|
9b660f |
2.28.0
|
|
|
9b660f |
|
|
|
9b660f |
|
|
|
9b660f |
From 39ac7cad68d8c00d98c900b35add637b01eddbbf Mon Sep 17 00:00:00 2001
|
|
|
9b660f |
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
|
|
|
9b660f |
Date: Tue, 31 Mar 2020 21:07:59 +0200
|
|
|
9b660f |
Subject: [PATCH 2/2] screenShield: Wake up on deactivate()
|
|
|
9b660f |
|
|
|
9b660f |
Usually the screen is woken up before the shield is deactivated, but
|
|
|
9b660f |
it is also possible to unlock the session programmatically via the
|
|
|
9b660f |
org.gnome.ScreenSaver D-Bus API.
|
|
|
9b660f |
|
|
|
9b660f |
The intention is very likely not to unlock a turned off screen in
|
|
|
9b660f |
that case. Nor does it seem like a good idea to change the lock
|
|
|
9b660f |
state without any indication.
|
|
|
9b660f |
|
|
|
9b660f |
Waking up the screen is more likely to meet expectations and is
|
|
|
9b660f |
more reasonable too, so do that.
|
|
|
9b660f |
|
|
|
9b660f |
https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1158
|
|
|
9b660f |
---
|
|
|
9b660f |
js/ui/screenShield.js | 2 ++
|
|
|
9b660f |
1 file changed, 2 insertions(+)
|
|
|
9b660f |
|
|
|
9b660f |
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
|
|
|
9b660f |
index 282f29fa30..2d0a429bee 100644
|
|
|
9b660f |
--- a/js/ui/screenShield.js
|
|
|
9b660f |
+++ b/js/ui/screenShield.js
|
|
|
9b660f |
@@ -1200,6 +1200,8 @@ var ScreenShield = class {
|
|
|
9b660f |
if (Main.sessionMode.currentMode == 'unlock-dialog')
|
|
|
9b660f |
Main.sessionMode.popMode('unlock-dialog');
|
|
|
9b660f |
|
|
|
9b660f |
+ this.emit('wake-up-screen');
|
|
|
9b660f |
+
|
|
|
9b660f |
if (this._isGreeter) {
|
|
|
9b660f |
// We don't want to "deactivate" any more than
|
|
|
9b660f |
// this. In particular, we don't want to drop
|
|
|
9b660f |
--
|
|
|
9b660f |
2.28.0
|
|
|
9b660f |
|