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

Revert "appDisplay: Reimplement drag motion using page indicators"

Browse Source 
This reverts commit 09b975fabf.

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

46
js/ui/appDisplay.js
View File

@ -543,7 +543,7 @@ var BaseAppView = GObject.registerClass({
style_class: 'page-navigation-hint next', style_class: 'page-navigation-hint next',
opacity: 0, opacity: 0,
visible: false, visible: false,
reactive: true, reactive: false,
x_expand: true, x_expand: true,
y_expand: true, y_expand: true,
x_align: Clutter.ActorAlign.FILL, x_align: Clutter.ActorAlign.FILL,
@ -554,7 +554,7 @@ var BaseAppView = GObject.registerClass({
style_class: 'page-navigation-hint previous', style_class: 'page-navigation-hint previous',
opacity: 0, opacity: 0,
visible: false, visible: false,
reactive: true, reactive: false,
x_expand: true, x_expand: true,
y_expand: true, y_expand: true,
x_align: Clutter.ActorAlign.FILL, x_align: Clutter.ActorAlign.FILL,
@ -638,6 +638,7 @@ var BaseAppView = GObject.registerClass({
() => this._redisplay(), this); () => this._redisplay(), this);
// Drag n' Drop // Drag n' Drop
this._lastOvershoot = -1;
this._lastOvershootTimeoutId = 0; this._lastOvershootTimeoutId = 0;
this._delayedMoveData = null; this._delayedMoveData = null;
@ -842,37 +843,54 @@ var BaseAppView = GObject.registerClass({
if (this._lastOvershootTimeoutId) if (this._lastOvershootTimeoutId)
GLib.source_remove(this._lastOvershootTimeoutId); GLib.source_remove(this._lastOvershootTimeoutId);
this._lastOvershootTimeoutId = 0; this._lastOvershootTimeoutId = 0;
this._lastOvershoot = -1;
} }
_handleDragOvershoot(dragEvent) { _handleDragOvershoot(dragEvent) {
const [gridX, gridY] = this.get_transformed_position();
const [gridWidth, gridHeight] = this.get_transformed_size();
const vertical = this._orientation === Clutter.Orientation.VERTICAL;
const gridStart = vertical ? gridY : gridX;
const gridEnd = vertical
? gridY + gridHeight - OVERSHOOT_THRESHOLD
: gridX + gridWidth - OVERSHOOT_THRESHOLD;
// Already animating // Already animating
if (this._adjustment.get_transition('value') !== null) if (this._adjustment.get_transition('value') !== null)
return; return;
const {targetActor} = dragEvent; // Within the grid boundaries
const dragPosition = vertical ? dragEvent.y : dragEvent.x;
if (targetActor !== this._prevPageIndicator && if (dragPosition > gridStart && dragPosition < gridEnd) {
targetActor !== this._nextPageIndicator) { // Check whether we moved out the area of the last switch
if (Math.abs(this._lastOvershoot - dragPosition) > OVERSHOOT_THRESHOLD)
this._resetOvershoot(); this._resetOvershoot();
return; return;
} }
if (this._lastOvershootTimeoutId > 0) // Still in the area of the previous page switch
if (this._lastOvershoot >= 0)
return; return;
let targetPage; const rtl = this.get_text_direction() === Clutter.TextDirection.RTL;
if (dragEvent.targetActor === this._prevPageIndicator) if (dragPosition <= gridStart)
targetPage = this._grid.currentPage - 1; this.goToPage(this._grid.currentPage + (rtl ? 1 : -1));
else if (dragPosition >= gridEnd)
this.goToPage(this._grid.currentPage + (rtl ? -1 : 1));
else else
targetPage = this._grid.currentPage + 1;
if (targetPage < 0 || targetPage >= this._grid.nPages)
return; // don't go beyond first/last page return; // don't go beyond first/last page
this._lastOvershoot = dragPosition;
if (this._lastOvershootTimeoutId > 0)
GLib.source_remove(this._lastOvershootTimeoutId);
this._lastOvershootTimeoutId = 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._handleDragOvershoot(dragEvent);
return GLib.SOURCE_REMOVE; return GLib.SOURCE_REMOVE;
}); });
GLib.Source.set_name_by_id(this._lastOvershootTimeoutId, GLib.Source.set_name_by_id(this._lastOvershootTimeoutId,