Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SDA-4329: Fixing 4329 & 4327 #2002

Merged
merged 1 commit into from
Nov 2, 2023
Merged

SDA-4329: Fixing 4329 & 4327 #2002

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions src/app/stores/window-store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export class WindowStore {
currentWindow?.hide();
}
} else {
currentWindow.minimize();
currentWindow.hide();
}
}
});
Expand Down Expand Up @@ -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;
Expand All @@ -119,7 +116,6 @@ export class WindowStore {
focusedWindowToRestore,
);

showBadgeCount(presenceStatusStore.getNotificationCount());
const mainWindow = windowHandler.getMainWindow();
if (mainWindow) {
const items = presenceStatus.createThumbarButtons();
Expand All @@ -128,6 +124,8 @@ export class WindowStore {
logger.info('window-store: restoring thumbnail toolbar buttons');
}

showBadgeCount(presenceStatusStore.getNotificationCount());

// Store reset
this.destroyWindowStore();
}
Expand Down Expand Up @@ -187,6 +185,7 @@ export class WindowStore {
} else {
if (windowToFocus) {
windowToFocus?.show();
windowToFocus?.moveTop();
windowHandler.moveSnippingToolWindow(windowToFocus);
}
this.windowsRestored = true;
Expand Down