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

[MM-26016] Hide tray icon theme colour when tray icon not enabled (#2051)

Browse Source
This commit is contained in:
Devin Binnie
2022-04-14 10:15:21 -04:00
committed by GitHub
parent bce2811dbc
commit b8244f3266
1 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -712,49 +712,51 @@ export default class SettingsPage extends React.PureComponent<Record<string, nev
</FormCheck>); </FormCheck>);
} }
if (window.process.platform === 'linux' || window.process.platform === 'win32') { if (this.state.showTrayIcon) {
options.push( if (window.process.platform === 'linux' || window.process.platform === 'win32') {
<FormGroup options.push(
key='trayIconTheme' <FormGroup
ref={this.trayIconThemeRef} key='trayIconTheme'
style={{marginLeft: '20px'}} ref={this.trayIconThemeRef}
> style={{marginLeft: '20px'}}
{'Icon theme: '} >
{window.process.platform === 'win32' && {'Icon theme: '}
<> {window.process.platform === 'win32' &&
<FormCheck <>
type='radio' <FormCheck
inline={true} type='radio'
name='trayIconTheme' inline={true}
value='use_system' name='trayIconTheme'
defaultChecked={this.state.trayIconTheme === 'use_system' || !this.state.trayIconTheme} value='use_system'
onChange={() => this.handleChangeTrayIconTheme('use_system')} defaultChecked={this.state.trayIconTheme === 'use_system' || !this.state.trayIconTheme}
label={'Use system default'} onChange={() => this.handleChangeTrayIconTheme('use_system')}
/> label={'Use system default'}
{' '} />
</> {' '}
} </>
<FormCheck }
type='radio' <FormCheck
inline={true} type='radio'
name='trayIconTheme' inline={true}
value='light' name='trayIconTheme'
defaultChecked={this.state.trayIconTheme === 'light' || !this.state.trayIconTheme} value='light'
onChange={() => this.handleChangeTrayIconTheme('light')} defaultChecked={this.state.trayIconTheme === 'light' || !this.state.trayIconTheme}
label={'Light'} onChange={() => this.handleChangeTrayIconTheme('light')}
/> label={'Light'}
{' '} />
<FormCheck {' '}
type='radio' <FormCheck
inline={true} type='radio'
name='trayIconTheme' inline={true}
value='dark' name='trayIconTheme'
defaultChecked={this.state.trayIconTheme === 'dark'} value='dark'
onChange={() => this.handleChangeTrayIconTheme('dark')} defaultChecked={this.state.trayIconTheme === 'dark'}
label={'Dark'} onChange={() => this.handleChangeTrayIconTheme('dark')}
/> label={'Dark'}
</FormGroup>, />
); </FormGroup>,
);
}
} }
if (window.process.platform === 'linux' || window.process.platform === 'win32') { if (window.process.platform === 'linux' || window.process.platform === 'win32') {