Skip to content

fix(desktop): share settings sidebar width #523

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
lucas77778 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(desktop): share settings sidebar width #523

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions apps/desktop/src/renderer/src/settings/settings-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import { systemBridge } from '../ipc';
import { DesktopChrome } from '../shell/chrome/chrome';
import { DESKTOP_CHROME_METRICS_STYLE, DESKTOP_CHROME_SPACER_CLASS } from '../shell/chrome/metrics';
import type { DesktopShellStyle } from '../shell/layout/shell-style';
import { DEFAULT_LAYOUT } from '../shell/store/model';
import { useDesktopShellStore } from '../shell/store/store';
import { AboutTab } from './about-tab';
import { AgentsTab } from './agents-tab';
import { AppearanceTab } from './appearance-tab';
Expand All @@ -54,13 +54,6 @@ const AGENT_KINDS: readonly AgentKind[] = AgentKindSchema.options;
const DEFAULT_HISTORY_PROVIDER: AgentKind = 'claude-code';
const CLOSE_SETTINGS_SHORTCUT = { key: 'Escape' } as const;

const SETTINGS_CHROME_STYLE: DesktopShellStyle = {
...DESKTOP_CHROME_METRICS_STYLE,
'--lc-sidebar-w': `${DEFAULT_LAYOUT.sidebarW}px`,
'--lc-right-w': '0px',
'--lc-bottom-h': '0px',
};

/**
* Full-page Settings surface. Rendered above the connection gate so it stays reachable even when the
* daemon is unreachable (needed to fix a bad daemon URL). The workbench stays mounted underneath.
Expand All @@ -74,13 +67,20 @@ export function SettingsView(): React.ReactNode {
const setCategory = useDesktopSettingsStore((state) => state.setSettingsCategory);
const historyProvider = useDesktopSettingsStore((state) => state.historyImportProvider);
const setHistoryProvider = useDesktopSettingsStore((state) => state.setHistoryImportProvider);
const sidebarWidth = useDesktopShellStore((state) => state.layout.sidebarW);
const [searchQuery, setSearchQuery] = useState('');
const searchKeywords = useSettingsSearchKeywords();
const settingsRootRef = useRef<HTMLDivElement>(null);
const desktopPlatform = systemBridge.app.platform;
const hasNativeTrafficLights = desktopPlatform === 'darwin';
const hasNativeBackdrop = desktopPlatform === 'darwin' || desktopPlatform === 'win32';
const showWindowControls = desktopPlatform !== 'darwin';
const settingsChromeStyle: DesktopShellStyle = {
...DESKTOP_CHROME_METRICS_STYLE,
'--lc-sidebar-w': `${sidebarWidth}px`,
'--lc-right-w': '0px',
'--lc-bottom-h': '0px',
};

useKeyboardShortcut({
actionId: 'desktop.close-settings',
Expand Down Expand Up @@ -232,7 +232,7 @@ export function SettingsView(): React.ReactNode {
<div
ref={settingsRootRef}
className="linkcode-desktop-shell fixed inset-0 z-50 bg-transparent text-foreground"
style={SETTINGS_CHROME_STYLE}
style={settingsChromeStyle}
>
<DesktopChrome
header={{ title: t('title') }}
Expand Down
Loading