Skip to content

Commit f4ab7eb

Browse files
Add appearance settings and theme system
- Move theme control into a dedicated appearance settings panel - Add built-in themes, accent overrides, and desktop IPC sync - Migrate settings and update components to use unified appearance state
1 parent a60daa1 commit f4ab7eb

19 files changed

Lines changed: 780 additions & 194 deletions

‎apps/desktop/src/main.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ syncShellEnvironment();
5050
const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
5151
const CONFIRM_CHANNEL = "desktop:confirm";
5252
const SET_THEME_CHANNEL = "desktop:set-theme";
53+
const SET_APPEARANCE_CHANNEL = "desktop:set-appearance";
5354
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
5455
const OPEN_EXTERNAL_CHANNEL = "desktop:open-external";
5556
const MENU_ACTION_CHANNEL = "desktop:menu-action";
@@ -1160,6 +1161,17 @@ function registerIpcHandlers(): void {
11601161
nativeTheme.themeSource = theme;
11611162
});
11621163

1164+
ipcMain.removeHandler(SET_APPEARANCE_CHANNEL);
1165+
ipcMain.handle(SET_APPEARANCE_CHANNEL, async (_event, raw: unknown) => {
1166+
if (typeof raw !== "object" || raw === null) return;
1167+
const appearance = raw as Record<string, unknown>;
1168+
const mode = getSafeTheme(appearance.mode);
1169+
if (!mode) return;
1170+
nativeTheme.themeSource = mode;
1171+
// themeId and accentHue are stored for future Electron shell styling
1172+
// (title bar tint, vibrancy, etc.)
1173+
});
1174+
11631175
ipcMain.removeHandler(CONTEXT_MENU_CHANNEL);
11641176
ipcMain.handle(
11651177
CONTEXT_MENU_CHANNEL,

‎apps/desktop/src/preload.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import type { DesktopBridge } from "@t3tools/contracts";
44
const PICK_FOLDER_CHANNEL = "desktop:pick-folder";
55
const CONFIRM_CHANNEL = "desktop:confirm";
66
const SET_THEME_CHANNEL = "desktop:set-theme";
7+
const SET_APPEARANCE_CHANNEL = "desktop:set-appearance";
78
const CONTEXT_MENU_CHANNEL = "desktop:context-menu";
89
const OPEN_EXTERNAL_CHANNEL = "desktop:open-external";
910
const MENU_ACTION_CHANNEL = "desktop:menu-action";
@@ -22,6 +23,7 @@ contextBridge.exposeInMainWorld("desktopBridge", {
2223
pickFolder: () => ipcRenderer.invoke(PICK_FOLDER_CHANNEL),
2324
confirm: (message) => ipcRenderer.invoke(CONFIRM_CHANNEL, message),
2425
setTheme: (theme) => ipcRenderer.invoke(SET_THEME_CHANNEL, theme),
26+
setAppearance: (appearance) => ipcRenderer.invoke(SET_APPEARANCE_CHANNEL, appearance),
2527
showContextMenu: (items, position) => ipcRenderer.invoke(CONTEXT_MENU_CHANNEL, items, position),
2628
openExternal: (url: string) => ipcRenderer.invoke(OPEN_EXTERNAL_CHANNEL, url),
2729
onMenuAction: (listener) => {

‎apps/web/src/components/ChatMarkdown.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { openInPreferredEditor } from "../editorPreferences";
2020
import { resolveDiffThemeName, type DiffThemeName } from "../lib/diffRendering";
2121
import { fnv1a32 } from "../lib/diffRendering";
2222
import { LRUCache } from "../lib/lruCache";
23-
import { useTheme } from "../hooks/useTheme";
23+
import { useAppearance } from "../hooks/useAppearance";
2424
import { resolveMarkdownFileLinkTarget } from "../markdown-links";
2525
import { readNativeApi } from "../nativeApi";
2626

@@ -236,7 +236,7 @@ function SuspenseShikiCodeBlock({
236236
}
237237

238238
function ChatMarkdown({ text, cwd, isStreaming = false }: ChatMarkdownProps) {
239-
const { resolvedTheme } = useTheme();
239+
const { resolvedTheme } = useAppearance();
240240
const diffThemeName = resolveDiffThemeName(resolvedTheme);
241241
const markdownComponents = useMemo<Components>(
242242
() => ({

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ import {
7979
type TurnDiffSummary,
8080
} from "../types";
8181
import { basenameOfPath } from "../vscode-icons";
82-
import { useTheme } from "../hooks/useTheme";
82+
import { useAppearance } from "../hooks/useAppearance";
8383
import { useTurnDiffSummaries } from "../hooks/useTurnDiffSummaries";
8484
import BranchToolbar from "./BranchToolbar";
8585
import { resolveShortcutCommand, shortcutLabelForCommand } from "../keybindings";
@@ -262,7 +262,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
262262
strict: false,
263263
select: (params) => parseDiffRouteSearch(params),
264264
});
265-
const { resolvedTheme } = useTheme();
265+
const { resolvedTheme } = useAppearance();
266266
const queryClient = useQueryClient();
267267
const createWorktreeMutation = useMutation(gitCreateWorktreeMutationOptions({ queryClient }));
268268
const composerDraft = useComposerThreadDraft(threadId);

‎apps/web/src/components/DiffPanel.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { cn } from "~/lib/utils";
2525
import { readNativeApi } from "../nativeApi";
2626
import { resolvePathLinkTarget } from "../terminal-links";
2727
import { parseDiffRouteSearch, stripDiffSearchParams } from "../diffRouteSearch";
28-
import { useTheme } from "../hooks/useTheme";
28+
import { useAppearance } from "../hooks/useAppearance";
2929
import { buildPatchCacheKey } from "../lib/diffRendering";
3030
import { resolveDiffThemeName } from "../lib/diffRendering";
3131
import { useTurnDiffSummaries } from "../hooks/useTurnDiffSummaries";
@@ -165,7 +165,7 @@ export { DiffWorkerPoolProvider } from "./DiffWorkerPoolProvider";
165165

166166
export default function DiffPanel({ mode = "inline" }: DiffPanelProps) {
167167
const navigate = useNavigate();
168-
const { resolvedTheme } = useTheme();
168+
const { resolvedTheme } = useAppearance();
169169
const settings = useSettings();
170170
const [diffRenderMode, setDiffRenderMode] = useState<DiffRenderMode>("stacked");
171171
const [diffWordWrap, setDiffWordWrap] = useState(settings.diffWordWrap);

‎apps/web/src/components/DiffWorkerPoolProvider.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { WorkerPoolContextProvider, useWorkerPool } from "@pierre/diffs/react";
22
import DiffsWorker from "@pierre/diffs/worker/worker.js?worker";
33
import { useEffect, useMemo, type ReactNode } from "react";
4-
import { useTheme } from "../hooks/useTheme";
4+
import { useAppearance } from "../hooks/useAppearance";
55
import { resolveDiffThemeName, type DiffThemeName } from "../lib/diffRendering";
66

77
function DiffWorkerThemeSync({ themeName }: { themeName: DiffThemeName }) {
@@ -29,7 +29,7 @@ function DiffWorkerThemeSync({ themeName }: { themeName: DiffThemeName }) {
2929
}
3030

3131
export function DiffWorkerPoolProvider({ children }: { children?: ReactNode }) {
32-
const { resolvedTheme } = useTheme();
32+
const { resolvedTheme } = useAppearance();
3333
const diffThemeName = resolveDiffThemeName(resolvedTheme);
3434
const workerPoolSize = useMemo(() => {
3535
const cores =

‎apps/web/src/components/KeybindingsToast.browser.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ function createBaseServerConfig(): ServerConfig {
6060
enableAssistantStreaming: false,
6161
defaultThreadEnvMode: "local" as const,
6262
textGenerationModelSelection: { provider: "codex" as const, model: "gpt-5.4-mini" },
63+
colorMode: "system" as const,
64+
activeThemeId: "t3code",
65+
accentHue: null,
6366
providers: {
6467
codex: { enabled: true, binaryPath: "", homePath: "", customModels: [] },
6568
claudeAgent: { enabled: true, binaryPath: "", customModels: [] },

0 commit comments

Comments
 (0)