From a29ec05c9a91d15ca40b64540da128cbc74bc28c Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Tue, 15 Jul 2025 14:14:21 -0400 Subject: [PATCH 1/2] fix(tui): permissions: properly pad command block This change ensures the bash command block has 1 vertical padding and 2 horizontal paddings, improving the visual layout in the permissions dialog. --- .../tui/components/dialogs/permissions/permissions.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/internal/tui/components/dialogs/permissions/permissions.go b/internal/tui/components/dialogs/permissions/permissions.go index 0bbaa034ed2357cc4643ad92c0a680bb01cf61ff..356c6ec8d5ad8a7ef8138251b0ab6887eb6583a1 100644 --- a/internal/tui/components/dialogs/permissions/permissions.go +++ b/internal/tui/components/dialogs/permissions/permissions.go @@ -16,7 +16,6 @@ import ( "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/lipgloss/v2" - "github.com/charmbracelet/x/ansi" ) type PermissionAction string @@ -317,18 +316,14 @@ func (p *permissionDialogCmp) generateBashContent() string { content := pr.Command t := styles.CurrentTheme() content = strings.TrimSpace(content) - content = "\n" + content + "\n" lines := strings.Split(content, "\n") width := p.width - 4 var out []string for _, ln := range lines { - ln = " " + ln // left padding - if len(ln) > width { - ln = ansi.Truncate(ln, width, "…") - } out = append(out, t.S().Muted. Width(width). + Padding(0, 2). Foreground(t.FgBase). Background(t.BgSubtle). Render(ln)) @@ -338,6 +333,7 @@ func (p *permissionDialogCmp) generateBashContent() string { renderedContent := strings.Join(out, "\n") finalContent := baseStyle. Width(p.contentViewPort.Width()). + Padding(1, 0). Render(renderedContent) return finalContent From ccd83f755a3f7df02683844c9a5d49b69ae4396d Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Tue, 15 Jul 2025 17:34:38 -0400 Subject: [PATCH 2/2] Update internal/tui/components/dialogs/permissions/permissions.go Co-authored-by: Christian Rocha --- internal/tui/components/dialogs/permissions/permissions.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/tui/components/dialogs/permissions/permissions.go b/internal/tui/components/dialogs/permissions/permissions.go index 356c6ec8d5ad8a7ef8138251b0ab6887eb6583a1..6f346d9a339cb82d6cf0ffcef5703804af39ed81 100644 --- a/internal/tui/components/dialogs/permissions/permissions.go +++ b/internal/tui/components/dialogs/permissions/permissions.go @@ -323,7 +323,7 @@ func (p *permissionDialogCmp) generateBashContent() string { for _, ln := range lines { out = append(out, t.S().Muted. Width(width). - Padding(0, 2). + Padding(0, 3). Foreground(t.FgBase). Background(t.BgSubtle). Render(ln))