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

[MM-37797] Re-added the check for flashing the window (#1696)

Browse Source
This commit is contained in:
Devin Binnie
2021-08-13 10:08:00 -04:00
committed by GitHub
parent 60c73d6d58
commit 52becc3467
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/windows/windowManager.ts
View File

@@ -227,12 +227,14 @@ export function restoreMain() {
export function flashFrame(flash: boolean) { export function flashFrame(flash: boolean) {
if (process.platform === 'linux' || process.platform === 'win32') { if (process.platform === 'linux' || process.platform === 'win32') {
if (status.config?.notifications.flashWindow) {
status.mainWindow?.flashFrame(flash); status.mainWindow?.flashFrame(flash);
if (status.settingsWindow) { if (status.settingsWindow) {
// main might be hidden behind the settings // main might be hidden behind the settings
status.settingsWindow.flashFrame(flash); status.settingsWindow.flashFrame(flash);
} }
} }
}
if (process.platform === 'darwin' && status.config?.notifications.bounceIcon) { if (process.platform === 'darwin' && status.config?.notifications.bounceIcon) {
app.dock.bounce(status.config?.notifications.bounceIconType); app.dock.bounce(status.config?.notifications.bounceIconType);
} }

4
src/renderer/components/SettingsPage.tsx
View File

@@ -239,13 +239,13 @@ export default class SettingsPage extends React.PureComponent<Record<string, nev
key: 'notifications', key: 'notifications',
data: { data: {
...this.state.notifications, ...this.state.notifications,
flashWindow: this.flashWindowRef.current?.checked ? 0 : 2, flashWindow: this.flashWindowRef.current?.checked ? 2 : 0,
}, },
}); });
this.setState({ this.setState({
notifications: { notifications: {
...this.state.notifications, ...this.state.notifications,
flashWindow: this.flashWindowRef.current?.checked ? 0 : 2, flashWindow: this.flashWindowRef.current?.checked ? 2 : 0,
}, },
}); });
} }