BetterSEQTA/BetterSEQTA-Plus
1
0
Fork 0
mirror of https://github.com/BetterSEQTA/BetterSEQTA-Plus.git synced 2026-06-06 03:34:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: themes somtimes override default custom accent colour

Browse Source
This commit is contained in:
SethBurkart123
2025-03-28 11:50:52 +11:00
parent a33f4f3f00
commit c4c50f2c30
3 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/built-in/themes/ThemeCreator.ts
+4 -2
View File
@@ -15,9 +15,11 @@ const themeManager = ThemeManager.getInstance();
export function OpenThemeCreator(themeID: string = "") {
CloseThemeCreator()
// Store that theme creator is open and save original color
// Only store original color if we're not editing an existing theme
localStorage.setItem('themeCreatorOpen', 'true');
localStorage.setItem('originalPreviewColor', settingsState.selectedColor);
if (!themeID) {
localStorage.setItem('originalPreviewColor', settingsState.selectedColor);
}
const width = "310px"
src/plugins/built-in/themes/theme-manager.ts
+34 -25
View File
@@ -454,13 +454,15 @@ export class ThemeManager {
try {
const { CustomCSS, CustomImages, defaultColour, forceDark } = theme;
// Store original settings if not already stored
if (this.originalPreviewColor === null) {
this.originalPreviewColor = settingsState.selectedColor;
localStorage.setItem('originalPreviewColor', settingsState.selectedColor);
}
if (this.originalPreviewTheme === null) {
this.originalPreviewTheme = settingsState.DarkMode;
// Store original settings only if this is a new theme
if (!theme.webURL) {
if (this.originalPreviewColor === null) {
this.originalPreviewColor = settingsState.selectedColor;
localStorage.setItem('originalPreviewColor', settingsState.selectedColor);
}
if (this.originalPreviewTheme === null) {
this.originalPreviewTheme = settingsState.DarkMode;
}
}
// Apply custom CSS
@@ -487,12 +489,14 @@ export class ThemeManager {
// Update previousImageVariableNames
this.previousImageVariableNames = newImageVariableNames;
// Apply theme settings
if (forceDark !== undefined) {
settingsState.DarkMode = forceDark;
}
if (defaultColour) {
settingsState.selectedColor = defaultColour;
// Apply theme settings only if this is a new theme
if (!theme.webURL) {
if (forceDark !== undefined) {
settingsState.DarkMode = forceDark;
}
if (defaultColour) {
settingsState.selectedColor = defaultColour;
}
}
} catch (error) {
console.error('[ThemeManager] Error previewing theme:', error);
@@ -505,12 +509,15 @@ export class ThemeManager {
public async updatePreview(theme: Partial<LoadedCustomTheme>): Promise<void> {
console.debug('[ThemeManager] Updating theme preview');
try {
// Store original settings if not already stored
if (this.originalPreviewColor === null) {
this.originalPreviewColor = settingsState.selectedColor;
}
if (this.originalPreviewTheme === null) {
this.originalPreviewTheme = settingsState.DarkMode;
// Only store original settings if this is a new theme (not editing)
// We can tell it's a new theme if it has no webURL (which is set when a theme is saved/loaded)
if (!theme.webURL) {
if (this.originalPreviewColor === null) {
this.originalPreviewColor = settingsState.selectedColor;
}
if (this.originalPreviewTheme === null) {
this.originalPreviewTheme = settingsState.DarkMode;
}
}
// Apply CSS if changed
@@ -548,12 +555,14 @@ export class ThemeManager {
this.previousImageVariableNames = newImageVariableNames;
}
// Update theme settings
if (theme.forceDark !== undefined) {
settingsState.DarkMode = theme.forceDark;
}
if (theme.defaultColour) {
settingsState.selectedColor = theme.defaultColour;
// Update theme settings only if this is a new theme
if (!theme.webURL) {
if (theme.forceDark !== undefined) {
settingsState.DarkMode = theme.forceDark;
}
if (theme.defaultColour) {
settingsState.selectedColor = theme.defaultColour;
}
}
} catch (error) {
console.error('[ThemeManager] Error updating theme preview:', error);