vhad/PaperWM
1
0
Fork 0
mirror of https://github.com/gosticks/PaperWM.git synced 2026-02-25 10:12:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid getting stuck in preview state after swiping

Browse Source 
`space.moving` is obsolete so remove it. We already guard against starting new
animations with the same target in `move_to`, which means keeping track of the
«moving» window is unnecessary.

I also cleaned up the code a bit, removed a bunch of unused parameters.

The bug is a good indication why `space.moving` was pretty ad-hoc and bad:

Returning when `space.moving == metaWindow` assumed there was already a tween
running, which we didn't want to replace. Swiping breaks this assumption by
removing any existing tweens. So a swiping to a already «moving» window would
result in ensureViewport returning early, never calling moveDone.
This commit is contained in:
Tor Hedin Brønner 2018-12-06 19:49:26 +01:00
parent d0c253f892
commit 18eb343af3
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tiling.js
View File

@ -221,7 +221,6 @@ class Space extends Array {
this.shadow.set_position(-8 - Math.round(prefs.window_gap/2), -4);
this.selectedWindow = null;
this.moving = false;
this.leftStack = 0; // not implemented
this.rightStack = 0; // not implemented
@ -1774,10 +1773,6 @@ function animateDown(metaWindow) {
*/
function ensureViewport(meta_window, space, force) {
space = space || spaces.spaceOfWindow(meta_window);
if (space.moving == meta_window && !force) {
debug('already moving', meta_window.title);
return undefined;
}
let index = space.indexOf(meta_window);
if (index === -1 || space.length === 0)
@ -1871,31 +1866,24 @@ function updateSelection(space, metaWindow, noAnimate){
* Move the column containing @meta_window to x, y and propagate the change
* in @space. Coordinates are relative to monitor and y is optional.
*/
function move_to(space, metaWindow, { x, y, delay, transition,
onComplete, onStart, gap, force }) {
let index = space.indexOf(metaWindow);
if (index === -1)
function move_to(space, metaWindow, { x, y, transition, force }) {
if (space.indexOf(metaWindow) === -1)
return;
let clone = metaWindow.clone;
let delta = Math.round(clone.targetX) + space.targetX - x;
let target = space.targetX - delta;
if (!inPreview && delta === 0 && !force) {
let target = x - clone.targetX;
if (target === space.targetX && !force) {
space.moveDone();
return;
}
space.targetX = target;
space.startAnimate();
space.moving = metaWindow;
Tweener.addTween(space.cloneContainer,
{ x: target,
time: 0.25,
transition: 'easeInOutQuad',
onComplete: () => {
space.moving = false;
space.moveDone();
}
onComplete: space.moveDone.bind(space)
});
space.fixOverlays(metaWindow);