isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "appDisplay: Rename _lastOvershootTimeoutId"

Browse Source 
This reverts commit 692de0eb952beabe1ef484dbf341516152378f54.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2581>
This commit is contained in:
Jonas Dreßler 2022-12-09 20:16:22 +01:00 committed by Marge Bot
parent 272c770815
commit 52ed7917f3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/ui/appDisplay.js
View File

@ -638,7 +638,7 @@ var BaseAppView = GObject.registerClass({
() => this._redisplay(), this); () => this._redisplay(), this);
// Drag n' Drop // Drag n' Drop
this._overshootTimeoutId = 0; this._lastOvershootTimeoutId = 0;
this._delayedMoveData = null; this._delayedMoveData = null;
this._dragBeginId = 0; this._dragBeginId = 0;
@ -839,9 +839,9 @@ var BaseAppView = GObject.registerClass({
} }
_resetOvershoot() { _resetOvershoot() {
if (this._overshootTimeoutId) if (this._lastOvershootTimeoutId)
GLib.source_remove(this._overshootTimeoutId); GLib.source_remove(this._lastOvershootTimeoutId);
this._overshootTimeoutId = 0; this._lastOvershootTimeoutId = 0;
} }
_handleDragOvershoot(dragEvent) { _handleDragOvershoot(dragEvent) {
@ -857,7 +857,7 @@ var BaseAppView = GObject.registerClass({
return; return;
} }
if (this._overshootTimeoutId > 0) if (this._lastOvershootTimeoutId > 0)
return; return;
let targetPage; let targetPage;
@ -869,14 +869,14 @@ var BaseAppView = GObject.registerClass({
if (targetPage < 0 || targetPage >= this._grid.nPages) if (targetPage < 0 || targetPage >= this._grid.nPages)
return; // don't go beyond first/last page return; // don't go beyond first/last page
this._overshootTimeoutId = this._lastOvershootTimeoutId =
GLib.timeout_add(GLib.PRIORITY_DEFAULT, OVERSHOOT_TIMEOUT, () => { GLib.timeout_add(GLib.PRIORITY_DEFAULT, OVERSHOOT_TIMEOUT, () => {
this._resetOvershoot(); this._resetOvershoot();
this.goToPage(targetPage); this.goToPage(targetPage);
return GLib.SOURCE_REMOVE; return GLib.SOURCE_REMOVE;
}); });
GLib.Source.set_name_by_id(this._overshootTimeoutId, GLib.Source.set_name_by_id(this._lastOvershootTimeoutId,
'[gnome-shell] this._overshootTimeoutId'); '[gnome-shell] this._lastOvershootTimeoutId');
} }
_onDragBegin() { _onDragBegin() {