if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

SDA-4329: Fixing 4329 & 4327

Browse Source
This commit is contained in:
NguyenTranHoangSym
2023-11-02 13:34:41 +07:00
parent 28358ddfe7
commit 2917b4c8ad
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/app/stores/window-store.ts
View File

@@ -62,7 +62,7 @@ export class WindowStore {
currentWindow?.hide();
}
} else {
currentWindow.minimize();
currentWindow.hide();
}
}
});
@@ -94,14 +94,11 @@ export class WindowStore {
currentWindow.id || '',
) as ICustomBrowserWindow;
if (window) {
if (isMac) {
if (currentWindow.isFullScreen) {
fullscreenedWindows.push(currentWindow);
} else if (!currentWindow.minimized && !currentWindow.focused) {
window.showInactive();
}
} else {
window.restore();
if (currentWindow.isFullScreen) {
fullscreenedWindows.push(currentWindow);
} else if (!currentWindow.minimized && !currentWindow.focused) {
window.showInactive();
window.moveTop();
}
if (currentWindow.focused) {
focusedWindowToRestore = window;
@@ -119,7 +116,6 @@ export class WindowStore {
focusedWindowToRestore,
);
showBadgeCount(presenceStatusStore.getNotificationCount());
const mainWindow = windowHandler.getMainWindow();
if (mainWindow) {
const items = presenceStatus.createThumbarButtons();
@@ -128,6 +124,8 @@ export class WindowStore {
logger.info('window-store: restoring thumbnail toolbar buttons');
}
showBadgeCount(presenceStatusStore.getNotificationCount());
// Store reset
this.destroyWindowStore();
}
@@ -187,6 +185,7 @@ export class WindowStore {
} else {
if (windowToFocus) {
windowToFocus?.show();
windowToFocus?.moveTop();
windowHandler.moveSnippingToolWindow(windowToFocus);
}
this.windowsRestored = true;