diff --git a/packages/tui/src/component/dialog-workspace-file-changes.tsx b/packages/tui/src/component/dialog-workspace-file-changes.tsx index 957e085a038..0c0d1a79334 100644 --- a/packages/tui/src/component/dialog-workspace-file-changes.tsx +++ b/packages/tui/src/component/dialog-workspace-file-changes.tsx @@ -5,7 +5,15 @@ import { createStore } from "solid-js/store" import { FilePath } from "../ui/file-path" import { useTheme } from "../context/theme" import { useConfig } from "../config" -import { DIALOG_INSET, DialogBleed, DialogHeader, DialogLayout, useDialog, type DialogContext } from "../ui/dialog" +import { + DIALOG_INSET, + DialogBleed, + dialogWidth, + DialogHeader, + DialogLayout, + useDialog, + type DialogContext, +} from "../ui/dialog" import { getScrollAcceleration } from "../util/scroll" const options = ["no", "yes"] as const @@ -40,7 +48,10 @@ export function DialogWorkspaceFileChanges(props: { const fileNameWidth = createMemo(() => Math.max( 2, - Math.min(60, dimensions().width - 2) - DIALOG_INSET * 2 - 2 - Math.max(7, ...props.files.map(changeCountWidth)), + Math.min(dialogWidth("medium"), dimensions().width - 2) - + DIALOG_INSET * 2 - + 2 - + Math.max(7, ...props.files.map(changeCountWidth)), ), ) diff --git a/packages/tui/src/routes/session/dialog-fork.tsx b/packages/tui/src/routes/session/dialog-fork.tsx index d6fc9857269..2ba1a27fe14 100644 --- a/packages/tui/src/routes/session/dialog-fork.tsx +++ b/packages/tui/src/routes/session/dialog-fork.tsx @@ -4,7 +4,7 @@ import { useRoute } from "../../context/route" import { useClient } from "../../context/client" import { Spinner } from "../../component/spinner" import { DialogSelect, type DialogSelectOption } from "../../ui/dialog-select" -import { DialogHeader, DialogLayout, useDialog } from "../../ui/dialog" +import { DIALOG_LIST_INSET, DialogHeader, DialogLayout, useDialog } from "../../ui/dialog" import { useToast } from "../../ui/toast" import { errorMessage } from "../../util/error" import { Locale } from "../../util/locale" @@ -74,7 +74,7 @@ export function DialogFork(props: { sessionID: string; messageID?: string; onMov }> + }> Forking session… } diff --git a/packages/tui/src/ui/dialog.tsx b/packages/tui/src/ui/dialog.tsx index 960d49a0bee..6604e034794 100644 --- a/packages/tui/src/ui/dialog.tsx +++ b/packages/tui/src/ui/dialog.tsx @@ -124,10 +124,13 @@ export function DialogLayout( header: JSX.Element /** Usually a `DialogFooter` or a row of buttons. */ footer?: JSX.Element + /** Side padding in cells. Defaults to DIALOG_INSET. */ + inset?: number }>, ) { + const inset = () => props.inset ?? DIALOG_INSET return ( - + {props.header} {props.children} {props.footer}