vhad/PaperWM
1
0
Fork 0
mirror of https://github.com/gosticks/PaperWM.git synced 2026-10-04 19:46:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Always select a neighbour when closing selectedWindow

Browse Source 
Only look at the neighbours of the closed window when selecting a new window.

Also raise the window on ensure, this way the stacking order works like an mru
for selectedWindow.
This commit is contained in:
Tor Hedin Brønner
2018-07-02 18:28:25 +02:00
parent 36b28ace99
commit d03dc78cd6
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tiling.js
+21 -17
View File
@@ -232,24 +232,35 @@ class Space extends Array {
let index = this.indexOf(metaWindow);
if (index === -1)
return false;
let selected = this.selectedWindow;
if (selected === metaWindow) {
// Select a new window using the stack ordering;
let windows = this.getWindows();
let i = windows.indexOf(metaWindow);
let neighbours = [windows[i - 1], windows[i + 1]].filter(w => w);
let stack = global.display.sort_windows_by_stacking(neighbours);
selected = stack[stack.length - 1];
}
let column = this[index];
let row = column.indexOf(metaWindow);
column.splice(row, 1);
if (column.length === 0)
this.splice(index, 1);
if (this.selectedWindow === metaWindow) {
// Select a new window using the stack ordering;
let stack = global.display.sort_windows_by_stacking(this.getWindows());
this.selectedWindow = stack[stack.length - 1];
}
this.cloneContainer.remove_actor(metaWindow.clone);
Tweener.removeTweens(this.selection);
this.selection.width = 0;
this.visible = this.visible.filter(w => w !== metaWindow);
this.layout();
this.emit('window-removed', metaWindow, index, row);
if (selected)
ensureViewport(selected, this, true);
else
this.selectedWindow = null;
return true;
}
@@ -987,22 +998,14 @@ function remove_handler(workspace, meta_window) {
// window has already received the `focus` signal at this point.
// Not sure if we can check directly if _this_ window had focus when closed.
let space = spaces.spaceOf(workspace);
if (!space.removeWindow(meta_window))
return;
space.layout();
if (!meta_window.get_compositor_private())
signals.disconnect(meta_window);
// (could be an empty workspace)
if (space.selectedWindow) {
// Force a new ensure, since the focus_handler is run before
// window-removed
ensureViewport(space.selectedWindow, space, true);
}
let space = spaces.spaceOf(workspace);
space.removeWindow(meta_window);
}
/**
Handle windows entering workspaces.
*/
@@ -1200,6 +1203,7 @@ function ensureViewport(meta_window, space, force) {
});
updateSelection(space);
selected.raise();
space.emit('select');
}