Skip to content

Align settings tab content #181

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

Merged
Finesssee merged 2 commits into from
Jul 12, 2026
Merged

Align settings tab content #181

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
319e5fe
Align settings tab content
Finesssee Jul 12, 2026
ed99d80
Use one Settings window size
Finesssee Jul 12, 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
1 change: 1 addition & 0 deletions apps/desktop-tauri/src/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4865,6 +4865,7 @@ html:has(.menu-surface--tray) {

/* ── Settings body container: padded, centered, capped at 560px ─── */
.settings-body {
width: 100%;
max-width: 560px;
margin: 0 auto;
padding: 16px 20px 24px;
Expand Down
21 changes: 5 additions & 16 deletions apps/desktop-tauri/src/surfaces/Settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,22 +112,17 @@ function isSettingsTab(value: string): value is SettingsTab {
}

const SETTINGS_WINDOW_HEIGHT = 580;
const SETTINGS_WINDOW_DEFAULT_WIDTH = 496;
const SETTINGS_WINDOW_PROVIDERS_WIDTH = 600;
const SETTINGS_WINDOW_WIDTH = 600;

async function applySettingsWindowSize(tab: SettingsTab) {
const requestedWidth =
tab === "providers"
? SETTINGS_WINDOW_PROVIDERS_WIDTH
: SETTINGS_WINDOW_DEFAULT_WIDTH;
async function applySettingsWindowSize() {
const workArea = await getWorkAreaRect().catch(() => null);
const screenWidth = window.screen.availWidth || window.innerWidth || requestedWidth;
const screenWidth = window.screen.availWidth || window.innerWidth || SETTINGS_WINDOW_WIDTH;
const screenHeight = window.screen.availHeight || window.innerHeight || SETTINGS_WINDOW_HEIGHT;
const maxWidth = Math.min(workArea?.width ?? screenWidth, screenWidth);
const maxHeight = Math.min(workArea?.height ?? screenHeight, screenHeight);
const width = Math.max(
360,
Math.min(requestedWidth, maxWidth - 16),
Math.min(SETTINGS_WINDOW_WIDTH, maxWidth - 16),
);
const height = Math.max(
360,
Expand Down Expand Up @@ -164,18 +159,14 @@ export default function Settings({ state, initialTab: propTab }: { state: Bootst
const [activeTab, setActiveTab] = useState<SettingsTab>(initialTab);

useEffect(() => {
void applySettingsWindowSize(initialTab);
// initialTab is captured once on mount; subsequent tab changes are
// handled by handleTabClick / shellTarget effect below.
// eslint-disable-next-line react-hooks/exhaustive-deps
void applySettingsWindowSize();
}, []);

// Respond to prop-driven tab changes (detached window re-focus events).
useEffect(() => {
if (propTab && isSettingsTab(propTab)) {
setActiveTab((current) => {
if (current === propTab) return current;
void applySettingsWindowSize(propTab);
return propTab;
});
}
Expand All @@ -189,15 +180,13 @@ export default function Settings({ state, initialTab: propTab }: { state: Bootst
const nextTab: SettingsTab = shellTarget.tab;
setActiveTab((current) => {
if (current === nextTab) return current;
void applySettingsWindowSize(nextTab);
return nextTab;
});
}, [shellTarget]);

const set = (patch: SettingsUpdate) => void update(patch);
const handleTabClick = useCallback((tab: SettingsTab) => {
setActiveTab(tab);
void applySettingsWindowSize(tab);
// Only transition the main window if we're NOT in the detached settings window
if (getCurrentWebviewWindow().label !== "settings") {
void setSurfaceMode("settings", { kind: "settings", tab });
Expand Down