aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix top bar theme when changing the system settings (#2821) (#2825)

Browse source 
(cherry picked from commit 5afc8e738c)

Co-authored-by: Daniel Espino García <larkox@gmail.com>
This commit is contained in:
Mattermost Build 2023-09-06 23:58:39 +03:00 committed by GitHub
parent aee4855712
commit c71bb97ec3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/renderer/components/MainPage.tsx
View file

@ -54,7 +54,6 @@ type State = {
mentionCounts: Record<string, number>;
maximized: boolean;
tabViewStatus: Map<string, TabViewStatus>;
darkMode: boolean;
modalOpen?: boolean;
fullScreen?: boolean;
showExtraBar?: boolean;
@ -91,7 +90,6 @@ class MainPage extends React.PureComponent<Props, State> {
mentionCounts: {},
maximized: false,
tabViewStatus: new Map(),
darkMode: this.props.darkMode,
isMenuOpen: false,
isDownloadsDropdownOpen: false,
showDownloadsBadge: false,
@ -194,10 +192,6 @@ class MainPage extends React.PureComponent<Props, State> {
this.updateTabStatus(viewId, statusValue);
});
window.desktop.onDarkModeChange((darkMode) => {
this.setState({darkMode});
});
// can't switch tabs sequentially for some reason...
window.desktop.onSetActiveView(this.setActiveView);
@ -407,7 +401,7 @@ class MainPage extends React.PureComponent<Props, State> {
const tabsRow = (
<TabBar
id='tabBar'
isDarkMode={this.state.darkMode}
isDarkMode={this.props.darkMode}
tabs={currentTabs}
sessionsExpired={this.state.sessionsExpired}
unreadCounts={this.state.unreadCounts}
@ -424,13 +418,13 @@ class MainPage extends React.PureComponent<Props, State> {
const topBarClassName = classNames('topBar', {
macOS: window.process.platform === 'darwin',
darkMode: this.state.darkMode,
darkMode: this.props.darkMode,
fullScreen: this.state.fullScreen,
});
const downloadsDropdownButton = this.state.hasDownloads ? (
<DownloadsDropdownButton
darkMode={this.state.darkMode}
darkMode={this.props.darkMode}
isDownloadsDropdownOpen={this.state.isDownloadsDropdownOpen}
showDownloadsBadge={this.state.showDownloadsBadge}
closeDownloadsDropdown={this.closeDownloadsDropdown}
@ -544,7 +538,7 @@ class MainPage extends React.PureComponent<Props, State> {
totalMentionCount={totalMentionCount}
hasUnreads={hasAnyUnreads}
isMenuOpen={this.state.isMenuOpen}
darkMode={this.state.darkMode}
darkMode={this.props.darkMode}
/>
)}
{tabsRow}
@ -589,7 +583,7 @@ class MainPage extends React.PureComponent<Props, State> {
const viewsRow = (
<Fragment>
<ExtraBar
darkMode={this.state.darkMode}
darkMode={this.props.darkMode}
show={this.state.showExtraBar}
goBack={() => {
window.desktop.goBack();