fix patch2 applying line OBS-URL: https://build.opensuse.org/request/show/423906 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=270
58 lines
2.3 KiB
Diff
58 lines
2.3 KiB
Diff
Index: gnome-shell-3.20.1/js/ui/screenShield.js
|
|
===================================================================
|
|
--- gnome-shell-3.20.1.orig/js/ui/screenShield.js
|
|
+++ gnome-shell-3.20.1/js/ui/screenShield.js
|
|
@@ -418,6 +418,8 @@ const ScreenShield = new Lang.Class({
|
|
this.actor = Main.layoutManager.screenShieldGroup;
|
|
|
|
this._lockScreenState = MessageTray.State.HIDDEN;
|
|
+ this._last_x = -1;
|
|
+ this._last_y = -1;
|
|
this._lockScreenGroup = new St.Widget({ x_expand: true,
|
|
y_expand: true,
|
|
reactive: true,
|
|
@@ -427,6 +429,8 @@ const ScreenShield = new Lang.Class({
|
|
});
|
|
this._lockScreenGroup.connect('key-press-event',
|
|
Lang.bind(this, this._onLockScreenKeyPress));
|
|
+ this._lockScreenGroup.connect('motion-event',
|
|
+ Lang.bind(this, this._onLockScreenMotion));
|
|
this._lockScreenGroup.connect('scroll-event',
|
|
Lang.bind(this, this._onLockScreenScroll));
|
|
Main.ctrlAltTabManager.addGroup(this._lockScreenGroup, _("Lock"), 'changes-prevent-symbolic');
|
|
@@ -657,6 +661,25 @@ const ScreenShield = new Lang.Class({
|
|
return Clutter.EVENT_STOP;
|
|
},
|
|
|
|
+ _onLockScreenMotion: function(actor, event) {
|
|
+ if (this._lockScreenState != MessageTray.State.SHOWN)
|
|
+ return false;
|
|
+ let [X, Y] = event.get_coords();
|
|
+
|
|
+ if (this._last_x == -1)
|
|
+ this._last_x = X;
|
|
+ if (this._last_y == -1)
|
|
+ this._last_y = Y;
|
|
+
|
|
+ let min_distance = 10
|
|
+ let distance = Math.max(Math.abs(this._last_x - X),
|
|
+ Math.abs(this._last_y - Y));
|
|
+
|
|
+ if (distance >= min_distance)
|
|
+ this._liftShield(true, 0);
|
|
+ return true;
|
|
+ },
|
|
+
|
|
_onLockScreenScroll: function(actor, event) {
|
|
if (this._lockScreenState != MessageTray.State.SHOWN)
|
|
return Clutter.EVENT_PROPAGATE;
|
|
@@ -973,6 +996,8 @@ const ScreenShield = new Lang.Class({
|
|
return;
|
|
|
|
this._ensureLockScreen();
|
|
+ this._last_x = -1;
|
|
+ this._last_y = -1;
|
|
this._lockDialogGroup.scale_x = 1;
|
|
this._lockDialogGroup.scale_y = 1;
|
|
|