screenShield: Remove scrolling
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872
This commit is contained in:
parent
28f85a3308
commit
a3a00434b1
@ -57,8 +57,6 @@ var ScreenShield = class {
|
|||||||
});
|
});
|
||||||
this._lockScreenGroup.connect('key-press-event',
|
this._lockScreenGroup.connect('key-press-event',
|
||||||
this._onLockScreenKeyPress.bind(this));
|
this._onLockScreenKeyPress.bind(this));
|
||||||
this._lockScreenGroup.connect('scroll-event',
|
|
||||||
this._onLockScreenScroll.bind(this));
|
|
||||||
Main.ctrlAltTabManager.addGroup(this._lockScreenGroup, _("Lock"), 'changes-prevent-symbolic');
|
Main.ctrlAltTabManager.addGroup(this._lockScreenGroup, _("Lock"), 'changes-prevent-symbolic');
|
||||||
|
|
||||||
this._lockDialogGroup = new St.Widget({ x_expand: true,
|
this._lockDialogGroup = new St.Widget({ x_expand: true,
|
||||||
@ -226,25 +224,6 @@ var ScreenShield = class {
|
|||||||
return Clutter.EVENT_STOP;
|
return Clutter.EVENT_STOP;
|
||||||
}
|
}
|
||||||
|
|
||||||
_onLockScreenScroll(actor, event) {
|
|
||||||
if (this._lockScreenState != MessageTray.State.SHOWN)
|
|
||||||
return Clutter.EVENT_PROPAGATE;
|
|
||||||
|
|
||||||
let delta = 0;
|
|
||||||
if (event.get_scroll_direction() == Clutter.ScrollDirection.SMOOTH)
|
|
||||||
delta = Math.abs(event.get_scroll_delta()[0]);
|
|
||||||
else
|
|
||||||
delta = 5;
|
|
||||||
|
|
||||||
this._lockScreenScrollCounter += delta;
|
|
||||||
|
|
||||||
// 7 standard scrolls to lift up
|
|
||||||
if (this._lockScreenScrollCounter > 35)
|
|
||||||
this._liftShield();
|
|
||||||
|
|
||||||
return Clutter.EVENT_STOP;
|
|
||||||
}
|
|
||||||
|
|
||||||
_syncInhibitor() {
|
_syncInhibitor() {
|
||||||
let lockEnabled = this._settings.get_boolean(LOCK_ENABLED_KEY);
|
let lockEnabled = this._settings.get_boolean(LOCK_ENABLED_KEY);
|
||||||
let lockLocked = this._lockSettings.get_boolean(DISABLE_LOCK_KEY);
|
let lockLocked = this._lockSettings.get_boolean(DISABLE_LOCK_KEY);
|
||||||
@ -511,7 +490,6 @@ var ScreenShield = class {
|
|||||||
|
|
||||||
this._lockScreenState = MessageTray.State.SHOWN;
|
this._lockScreenState = MessageTray.State.SHOWN;
|
||||||
this._lockScreenGroup.fixed_position_set = false;
|
this._lockScreenGroup.fixed_position_set = false;
|
||||||
this._lockScreenScrollCounter = 0;
|
|
||||||
|
|
||||||
if (params.fadeToBlack && params.animateFade) {
|
if (params.fadeToBlack && params.animateFade) {
|
||||||
// Take a beat
|
// Take a beat
|
||||||
|
Loading…
Reference in New Issue
Block a user