appDisplay: Move onto the correct page while DnD on both LTR/RTL

Look up the next page correctly for the overshoot coordinates, given
the text direction. We don't need to look whether there is a next
page either, as goToPage() checks that it's the case.

Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3778
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1734>
This commit is contained in:
Carlos Garnacho 2021-03-01 18:13:02 +01:00
parent a6588d054f
commit 46361c9a04

View File

@ -475,13 +475,11 @@ var BaseAppView = GObject.registerClass({
if (this._lastOvershoot >= 0) if (this._lastOvershoot >= 0)
return; return;
const currentPosition = this._adjustment.value; const rtl = this.get_text_direction() === Clutter.TextDirection.RTL;
const maxPosition = this._adjustment.upper - this._adjustment.page_size; if (dragPosition <= gridStart)
this.goToPage(this._grid.currentPage + (rtl ? 1 : -1));
if (dragPosition <= gridStart && currentPosition > 0) else if (dragPosition >= gridEnd)
this.goToPage(this._grid.currentPage - 1); this.goToPage(this._grid.currentPage + (rtl ? -1 : 1));
else if (dragPosition >= gridEnd && currentPosition < maxPosition)
this.goToPage(this._grid.currentPage + 1);
else else
return; // don't go beyond first/last page return; // don't go beyond first/last page