SDA-4417 - Move focus listener outside did-finish-load and use window property instead of config for AlwaysOnTop (#2031)

This commit is contained in:
Kiran Niranjan 2023-12-14 13:41:38 +05:30 committed by GitHub
parent bc4d85c646
commit 06368d8e7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -638,20 +638,18 @@ export class WindowHandler {
MAIN_WEB_CONTENTS_EVENTS,
this.mainWebContents,
);
}
});
// workaround for https://perzoinc.atlassian.net/browse/SDA-4251
this.mainWindow?.on('focus', () => {
const { alwaysOnTop } = config.getConfigFields(['alwaysOnTop']);
logger.info('window-handler: main window focused', alwaysOnTop);
if (
alwaysOnTop === CloudConfigDataTypes.ENABLED &&
this.mainWindow &&
windowExists(this.mainWindow)
) {
this.mainWindow.setAlwaysOnTop(false);
this.mainWindow.setAlwaysOnTop(true);
}
});
// workaround for https://perzoinc.atlassian.net/browse/SDA-4251
this.mainWindow?.on('focus', () => {
if (
this.mainWindow &&
windowExists(this.mainWindow) &&
this.mainWindow.isAlwaysOnTop()
) {
this.mainWindow.setAlwaysOnTop(false);
this.mainWindow.setAlwaysOnTop(true);
}
});