bugfix: Finally fix theme application

This commit is contained in:
Alphons Joseph
2025-03-18 19:03:23 +08:00
parent 8e34db4a67
commit 7a76d3f4eb
4 changed files with 8 additions and 8 deletions
+4 -4
View File
@@ -42,7 +42,7 @@ export const UpdateThemePreview = async (updatedTheme: LoadedCustomTheme) => {
// Apply default color
if (defaultColour) {
// Store the original color if it hasn't been stored yet
if (originalColor === null) {
if (originalColor == null) {
originalColor = settingsState.selectedColor;
}
settingsState.selectedColor = defaultColour;
@@ -62,13 +62,13 @@ export const ClearThemePreview = () => {
}
// Reset the color to the original value
if (originalColor !== null) {
if (originalColor != null) {
settingsState.selectedColor = originalColor;
originalColor = null;
originalColor = settingsState.originalSelectedColor;
}
// Reset the theme (dark/light mode) to the original value
if (originalTheme !== null) {
if (originalTheme != null) {
settingsState.DarkMode = originalTheme;
originalTheme = null;
}
+1
View File
@@ -27,6 +27,7 @@ export const disableTheme = async () => {
}
settingsState.selectedTheme = ''
settingsState.selectedColor = settingsState.originalSelectedColor;
} catch (error) {
console.error('Error disabling theme:', error);
} finally {
+3 -2
View File
@@ -29,8 +29,9 @@ export const setTheme = async (themeId: string) => {
await applyTheme(theme);
settingsState.selectedTheme = themeId
settingsState.selectedColor = theme.selectedColor ? theme.selectedColor : (theme.defaultColour !== '' ? theme.defaultColour : '#007bff')
settingsState.originalSelectedColor = originalSelectedColor.selectedColor
//settingsState.selectedColor = theme.selectedColor ? theme.selectedColor : (theme.defaultColour !== '' ? theme.defaultColour : '#007bff')
settingsState.originalSelectedColor = settingsState.selectedColor;
settingsState.selectedColor = theme.defaultColour;
} catch (error) {
console.error('Error setting theme:', error);
}