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

Bugfix: Canceling navigator didn't return to focused window

Browse Source 
Regression after a8efb66aa5
This commit is contained in:
Ole Jørgen Brønner
2018-05-17 22:59:47 +02:00
parent b703bbb0b0
commit 2aa1f84b33
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
navigator.js
+9 -2
View File
@@ -367,13 +367,20 @@ var PreviewedWindowNavigator = new Lang.Class({
}
if (this.space === from && force) {
// We can't activate an already active workspace
// Animate the selected space into full view - normally this
// happens on workspace switch, but activating the same workspace
// again doesn't trigger a switch signal
switchWorkspace(this.space.workspace);
}
let selected = this.space.selectedWindow;
if (selected && !Scratch.isScratchActive()) {
Main.activateWindow(selected);
if (selected !== global.display.focus_window) {
Main.activateWindow(selected);
} else {
// Typically on cancel - just make sure the window is in view
Tiling.ensureViewport(selected, this.space);
}
debug('#preview', 'Finish', selected.title, this._selectedIndex);
} else {
this.space.workspace.activate(global.get_current_time());