PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #5670 from gsouquet/fix/is-on-dark-theme

Browse source 
Update isUserOnDarkTheme to take use_system_theme in account
This commit is contained in:
J. Ryan Stinnett 2021-02-22 17:29:49 +00:00 committed by GitHub
commit e30a0d6420
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/components/structures/UserMenu.tsx
View file

@ -103,11 +103,15 @@ export default class UserMenu extends React.Component<IProps, IState> {
}; };
private isUserOnDarkTheme(): boolean { private isUserOnDarkTheme(): boolean {
const theme = SettingsStore.getValue("theme"); if (SettingsStore.getValue("use_system_theme")) {
if (theme.startsWith("custom-")) { return window.matchMedia("(prefers-color-scheme: dark)").matches;
return getCustomTheme(theme.substring("custom-".length)).is_dark; } else {
const theme = SettingsStore.getValue("theme");
if (theme.startsWith("custom-")) {
return getCustomTheme(theme.substring("custom-".length)).is_dark;
}
return theme === "dark";
} }
return theme === "dark";
} }
private onProfileUpdate = async () => { private onProfileUpdate = async () => {