mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Fix dark mode when in light mode os theme

Browse source
This commit is contained in:
Jamie Kyle 2024-11-06 11:24:16 -08:00 • committed by GitHub
parent dc4896c9cb
commit 17a4bfd8d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ts/util/getThemeType.ts
View file

@ -2,20 +2,27 @@
// SPDX-License-Identifier: AGPL-3.0-only // SPDX-License-Identifier: AGPL-3.0-only
import { SystemThemeType, ThemeType } from '../types/Util'; import { SystemThemeType, ThemeType } from '../types/Util';
import { missingCaseError } from './missingCaseError';
export async function getThemeType(): Promise<ThemeType> { export async function getThemeType(): Promise<ThemeType> {
const themeSetting = await window.Events.getThemeSetting(); const themeSetting = await window.Events.getThemeSetting();
if ( if (themeSetting === 'light') {
themeSetting === 'light' ||
window.systemTheme === SystemThemeType.light
) {
return ThemeType.light; return ThemeType.light;
} }
if (themeSetting === 'dark' || window.systemTheme === SystemThemeType.dark) { if (themeSetting === 'dark') {
return ThemeType.dark; return ThemeType.dark;
} }
return window.systemTheme; if (themeSetting === 'system') {
if (window.systemTheme === SystemThemeType.light) {
return ThemeType.light;
}
if (window.systemTheme === SystemThemeType.dark) {
return ThemeType.dark;
}
throw missingCaseError(window.systemTheme);
}
throw missingCaseError(themeSetting);
} }