morgan/dash-to-panel
1
0
Fork 0
mirror of https://github.com/morgan9e/dash-to-panel synced 2026-04-15 00:34:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

Handle window receiving focus while being destroyed

Browse Source
This commit is contained in:
Charles Gagnon
2018-11-04 22:13:41 -05:00
parent 08dd6efa63
commit b061bfc688
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
proximity.js
View File

@@ -153,7 +153,7 @@ var ProximityManager = new Lang.Class({
if (focusedWindow) {
let focusedWindowInfo = this._getFocusedWindowInfo(focusedWindow);
if (this._checkIfHandledWindowType(focusedWindowInfo.metaWindow)) {
if (focusedWindowInfo && this._checkIfHandledWindowType(focusedWindowInfo.metaWindow)) {
focusedWindowInfo.allocationId = focusedWindowInfo.window.connect('allocation-changed', () => this._queueUpdate());
focusedWindowInfo.destroyId = focusedWindowInfo.window.connect('destroy', () => this._disconnectFocusedWindow(true));
@@ -163,16 +163,20 @@ var ProximityManager = new Lang.Class({
},
_getFocusedWindowInfo: function(focusedWindow) {
let focusedWindowInfo = { window: focusedWindow.get_compositor_private() };
focusedWindowInfo.metaWindow = focusedWindowInfo.window.get_meta_window();
let window = focusedWindow.get_compositor_private();
let focusedWindowInfo;
if (focusedWindow.is_attached_dialog()) {
let mainMetaWindow = focusedWindow.get_transient_for();
if (window) {
focusedWindowInfo = { window: window };
focusedWindowInfo.metaWindow = focusedWindowInfo.window.get_meta_window();
if (focusedWindowInfo.metaWindow.get_frame_rect().height < mainMetaWindow.get_frame_rect().height) {
focusedWindowInfo.window = mainMetaWindow.get_compositor_private();
focusedWindowInfo.metaWindow = mainMetaWindow;
if (focusedWindow.is_attached_dialog()) {
let mainMetaWindow = focusedWindow.get_transient_for();
if (focusedWindowInfo.metaWindow.get_frame_rect().height < mainMetaWindow.get_frame_rect().height) {
focusedWindowInfo.window = mainMetaWindow.get_compositor_private();
focusedWindowInfo.metaWindow = mainMetaWindow;
}
}
}