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

appDisplay: Add threshold after overshoot page switches

Browse Source 
We currently always switch app pages when a dragged app icon
moves outside the grid boundaries, regardless of any previous
page switches. This makes it too easy to switch multiple pages
accidentally, so add a small threshold that the icon has to
move back towards the grid before allowing another page switch.

https://gitlab.gnome.org/GNOME/gnome-shell/issues/1693
This commit is contained in:
Florian Müllner 2019-11-23 15:06:14 +01:00
parent 40b2fbf465
commit 48477443fa
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
js/ui/appDisplay.js
View File

@ -40,6 +40,8 @@ var PAGE_SWITCH_TIME = 300;
var APP_ICON_SCALE_IN_TIME = 500; var APP_ICON_SCALE_IN_TIME = 500;
var APP_ICON_SCALE_IN_DELAY = 700; var APP_ICON_SCALE_IN_DELAY = 700;
const OVERSHOOT_THRESHOLD = 20;
const SWITCHEROO_BUS_NAME = 'net.hadess.SwitcherooControl'; const SWITCHEROO_BUS_NAME = 'net.hadess.SwitcherooControl';
const SWITCHEROO_OBJECT_PATH = '/net/hadess/SwitcherooControl'; const SWITCHEROO_OBJECT_PATH = '/net/hadess/SwitcherooControl';
@ -351,6 +353,8 @@ var AllView = class AllView extends BaseAppView {
this._availWidth = 0; this._availWidth = 0;
this._availHeight = 0; this._availHeight = 0;
this._lastOvershootY = -1;
Main.overview.connect('hidden', () => this.goToPage(0)); Main.overview.connect('hidden', () => this.goToPage(0));
this._grid.connect('space-opened', () => { this._grid.connect('space-opened', () => {
let fadeEffect = this._scrollView.get_effect('fade'); let fadeEffect = this._scrollView.get_effect('fade');
@ -748,12 +752,24 @@ var AllView = class AllView extends BaseAppView {
let [, gridHeight] = this.actor.get_transformed_size(); let [, gridHeight] = this.actor.get_transformed_size();
let gridBottom = gridY + gridHeight; let gridBottom = gridY + gridHeight;
// Within the grid boundaries, or already animating // Already animating
if (dragEvent.y > gridY && dragEvent.y < gridBottom || if (this._adjustment.get_transition('value') !== null)
this._adjustment.get_transition('value') != null) { return;
// Within the grid boundaries
if (dragEvent.y > gridY && dragEvent.y < gridBottom) {
// Check whether we moved out the area of the last switch
if (Math.abs(this._lastOvershootY - dragEvent.y) > OVERSHOOT_THRESHOLD)
this._lastOvershootY = -1;
return; return;
} }
// Still in the area of the previous page switch
if (this._lastOvershootY >= 0)
return;
this._lastOvershootY = dragEvent.y;
// Moving above the grid // Moving above the grid
let currentY = this._adjustment.value; let currentY = this._adjustment.value;
if (dragEvent.y <= gridY && currentY > 0) { if (dragEvent.y <= gridY && currentY > 0) {
@ -799,6 +815,7 @@ var AllView = class AllView extends BaseAppView {
} }
this._eventBlocker.visible = this._currentPopup !== null; this._eventBlocker.visible = this._currentPopup !== null;
this._lastOvershootY = -1;
} }
_canAccept(source) { _canAccept(source) {