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

SDA-4604 Limiting window activation change to macOS for bring-to-front feature only #2177

Merged
merged 1 commit into from
Jul 18, 2024
Merged

SDA-4604 Limiting window activation change to macOS for bring-to-front feature only #2177

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion spec/mainApiHandler.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ describe('main api handler', () => {
reason: 'notification',
windowName: 'notification',
};
const expectedValue = ['notification'];
const expectedValue = ['notification', false];
ipcMain.send(apiName.symphonyApi, value);
expect(spy).toBeCalledWith(...expectedValue);
});
Expand Down
2 changes: 1 addition & 1 deletion src/app/main-api-handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ ipcMain.on(
if (typeof arg.reason === 'string' && arg.reason === 'notification') {
const { bringToFront } = config.getConfigFields(['bringToFront']);
if (bringToFront === CloudConfigDataTypes.ENABLED) {
activate(arg.windowName);
activate(arg.windowName, false);
}
}
break;
Expand Down
4 changes: 1 addition & 3 deletions src/app/window-actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,7 @@ export const activate = (
// Bring the window to the top without focusing
// Flash task bar icon in Windows for windows
if (!shouldFocus) {
return isMac || isLinux
? window.showInactive()
: window.flashFrame(true);
return isMac || isLinux ? window.show() : window.flashFrame(true);
}

// Note: On window just focusing will preserve window snapped state
Expand Down
Loading