Skip to content

Fix: Restore palette selection after theme switch #5892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rashi-cse wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix: Restore palette selection after theme switch #5892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59d2958
Fix: restore active palette correctly after theme change
rashi-cse Feb 23, 2026
281bbad
Apply Prettier formatting to themebox.js
rashi-cse Feb 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions js/palette.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ class Palettes {
this.dict = {};
this.selectorButtonsOff = []; // Select between palettes
this.selectorButtonsOn = []; // Select between palettes in their on state
this.selectorRows = []; // Store selector TR elements for state restoration
this.buttons = {}; // The toolbar button for each palette.
this.labels = {}; // The label for each button.
this.pluginPalettes = []; // List of palettes not in multipalette list
Expand Down Expand Up @@ -135,6 +136,8 @@ class Palettes {
}

const tr = docById("palette").children[0].children[0].children[0].children[0];
// Store selector TR for state restoration after theme change
this.selectorRows[i] = tr;
const td = tr.insertCell();
td.width = 1.5 * this.cellSize;
td.height = 1.5 * this.cellSize;
Expand Down Expand Up @@ -454,6 +457,9 @@ class Palettes {
</div>`;
element.childNodes[0].style.border = `1px solid ${platformColor.selectorSelected}`;
document.body.appendChild(element);

// Rebuild selector buttons with new theme colors
this.init_selectors();
} catch (e) {
console.error("Error clearing palettes:", e);
}
Expand Down
25 changes: 19 additions & 6 deletions js/themebox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//A dropdown for selecting theme

/*
global _, platformColor
global _, platformColor, MULTIPALETTES
*/

/* exported ThemeBox, themeConfigs */
Expand Down Expand Up @@ -201,11 +201,24 @@ class ThemeBox {
// Refresh palette if it exists
if (this.activity.palettes) {
try {
// Update palette selector border color
const paletteElement = document.getElementById("palette");
if (paletteElement && paletteElement.childNodes[0]) {
paletteElement.childNodes[0].style.border = `1px solid ${window.platformColor.selectorSelected}`;
}
// Convert palette NAME to group INDEX
// this.current stores palette NAME (e.g. "pitch")
// selectorRows[] is indexed by NUMBER (0, 1, 2)
const currentName = this.activity.palettes.current;
const currentIndex = MULTIPALETTES.findIndex(group => group.includes(currentName));

if (currentIndex === -1) return;

// Clear palette DOM and rebuild selectors with new theme colors
this.activity.palettes.clear();

// Restore selection using stored selector rows
const selectorRow = this.activity.palettes.selectorRows[currentIndex];
if (!selectorRow) return;

// Apply selection highlight and build category list (same as hover)
this.activity.palettes.showSelection(currentIndex, selectorRow);
this.activity.palettes.makePalettes(currentIndex);
} catch (e) {
console.debug("Could not refresh palette:", e);
}
Expand Down
Loading