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

[MM-44023] Remove Settings window flash, change wording on Settings page (#2088)

Browse Source
This commit is contained in:
Devin Binnie
2022-05-09 10:45:01 -04:00
committed by GitHub
parent ebf5897f99
commit 1414bbaedf
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/windows/windowManager.test.js
View File

@@ -348,7 +348,6 @@ describe('main/windows/windowManager', () => {
value: originalPlatform,
});
expect(windowManager.mainWindow.flashFrame).toBeCalledWith(true);
expect(windowManager.settingsWindow.flashFrame).toBeCalledWith(true);
});
it('mac - should not bounce icon when config item is not set', () => {

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

@@ -280,10 +280,6 @@ export class WindowManager {
if (process.platform === 'linux' || process.platform === 'win32') {
if (Config.notifications.flashWindow) {
this.mainWindow?.flashFrame(flash);
if (this.settingsWindow) {
// main might be hidden behind the settings
this.settingsWindow.flashFrame(flash);
}
}
}
if (process.platform === 'darwin' && Config.notifications.bounceIcon) {

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

@@ -629,9 +629,9 @@ export default class SettingsPage extends React.PureComponent<Record<string, nev
checked={!this.state.notifications || this.state.notifications.flashWindow === 2}
onChange={this.handleFlashWindow}
/>
{'Flash app window and taskbar icon when a new message is received'}
{'Flash taskbar icon when a new message is received'}
<FormText>
{'If enabled, app window and taskbar icon flash for a few seconds when a new message is received.'}
{'If enabled, the taskbar icon will flash for a few seconds when a new message is received.'}
{window.process.platform === 'linux' && (
<>
<br/>