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

[MM-36058][MM-40572] Tray fixes (#1933)

Browse Source 
* [MM-36058] Added config migration function, update default tray icon theme to system, allow Windows users to override icon theme

* [MM-40572] Restore minimize to tray option for Windows

* Lint fix

* Test fix

* Oops
This commit is contained in:
Devin Binnie
2022-01-04 15:00:56 -05:00
committed by GitHub
parent 3ecdd3d1c9
commit adf494e944
11 changed files with 94 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -637,7 +637,7 @@ export default class SettingsPage extends React.PureComponent<Record<string, nev
</FormCheck>);
}
if (window.process.platform === 'linux') {
if (window.process.platform === 'linux' || window.process.platform === 'win32') {
options.push(
<FormGroup
key='trayIconTheme'
@@ -645,6 +645,20 @@ export default class SettingsPage extends React.PureComponent<Record<string, nev
style={{marginLeft: '20px'}}
>
{'Icon theme: '}
{window.process.platform === 'win32' &&
<>
<FormCheck
type='radio'
inline={true}
name='trayIconTheme'
value='use_system'
defaultChecked={this.state.trayIconTheme === 'use_system' || !this.state.trayIconTheme}
onChange={() => this.handleChangeTrayIconTheme('use_system')}
label={'Use system default'}
/>
{' '}
</>
}
<FormCheck
type='radio'
inline={true}
@@ -668,7 +682,7 @@ export default class SettingsPage extends React.PureComponent<Record<string, nev
);
}
if (window.process.platform === 'linux') {
if (window.process.platform === 'linux' || window.process.platform === 'win32') {
options.push(
<FormCheck
key='inputMinimizeToTray'