phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[MM-49739] Set parent window on calls expanded popout view (#2539)

Browse Source 
* Set parent window on calls expanded popout view

* Fix focus on calls popout window

* Unregister event
This commit is contained in:
Claudio Costa
2023-02-06 09:31:50 -06:00
committed by GitHub
parent 97a31fc83b
commit 9213083335
4 changed files with 75 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/windows/callsWidgetWindow.ts
View File

@@ -25,9 +25,10 @@ import {
} from 'common/utils/constants';
import Utils from 'common/utils/util';
import {
CALLS_JOINED_CALL,
CALLS_POPOUT_FOCUS,
CALLS_WIDGET_RESIZE,
CALLS_WIDGET_SHARE_SCREEN,
CALLS_JOINED_CALL,
} from 'common/communication';
type LoadURLOpts = {
@@ -37,6 +38,7 @@ type LoadURLOpts = {
export default class CallsWidgetWindow extends EventEmitter {
public win: BrowserWindow;
private main: BrowserWindow;
private popOut: BrowserWindow | null = null;
private mainView: MattermostView;
private config: CallsWidgetWindowConfig;
private boundsErr: Rectangle = {
@@ -81,15 +83,10 @@ export default class CallsWidgetWindow extends EventEmitter {
ipcMain.on(CALLS_WIDGET_RESIZE, this.onResize);
ipcMain.on(CALLS_WIDGET_SHARE_SCREEN, this.onShareScreen);
ipcMain.on(CALLS_JOINED_CALL, this.onJoinedCall);
ipcMain.on(CALLS_POPOUT_FOCUS, this.onPopOutFocus);
this.win.webContents.setWindowOpenHandler(() => {
return {
action: 'allow',
overrideBrowserWindowOptions: {
autoHideMenuBar: true,
},
};
});
this.win.webContents.setWindowOpenHandler(this.onPopOutOpen);
this.win.webContents.on('did-create-window', this.onPopOutCreate);
this.load();
}
@@ -125,6 +122,7 @@ export default class CallsWidgetWindow extends EventEmitter {
ipcMain.off(CALLS_WIDGET_RESIZE, this.onResize);
ipcMain.off(CALLS_WIDGET_SHARE_SCREEN, this.onShareScreen);
ipcMain.off(CALLS_JOINED_CALL, this.onJoinedCall);
ipcMain.off(CALLS_POPOUT_FOCUS, this.onPopOutFocus);
}
private getWidgetURL() {
@@ -218,5 +216,28 @@ export default class CallsWidgetWindow extends EventEmitter {
this.setBounds(initialBounds);
}
private onPopOutOpen = () => {
return {
action: 'allow' as const,
overrideBrowserWindowOptions: {
autoHideMenuBar: true,
},
};
}
private onPopOutCreate = (win: BrowserWindow) => {
this.popOut = win;
}
private onPopOutFocus = () => {
if (!this.popOut) {
return;
}
if (this.popOut.isMinimized()) {
this.popOut.restore();
}
this.popOut.focus();
}
}