diff options
Diffstat (limited to 'packages/tui/internal/components/dialog')
6 files changed, 12 insertions, 14 deletions
diff --git a/packages/tui/internal/components/dialog/complete.go b/packages/tui/internal/components/dialog/complete.go index 4924885f9..f2ed30fff 100644 --- a/packages/tui/internal/components/dialog/complete.go +++ b/packages/tui/internal/components/dialog/complete.go @@ -26,7 +26,7 @@ type CompletionItemI interface { func (ci *CompletionItem) Render(selected bool, width int) string { t := theme.CurrentTheme() - baseStyle := styles.BaseStyle() + baseStyle := styles.NewStyle().Foreground(t.Text()) itemStyle := baseStyle. Background(t.BackgroundElement()). @@ -185,7 +185,7 @@ func (c *completionDialogComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) { func (c *completionDialogComponent) View() string { t := theme.CurrentTheme() - baseStyle := styles.BaseStyle() + baseStyle := styles.NewStyle().Foreground(t.Text()) maxWidth := 40 completions := c.list.GetItems() diff --git a/packages/tui/internal/components/dialog/init.go b/packages/tui/internal/components/dialog/init.go index 339e31ca4..cf81e5a07 100644 --- a/packages/tui/internal/components/dialog/init.go +++ b/packages/tui/internal/components/dialog/init.go @@ -94,7 +94,7 @@ func (m InitDialogCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) { // View implements tea.Model. func (m InitDialogCmp) View() string { t := theme.CurrentTheme() - baseStyle := styles.BaseStyle() + baseStyle := styles.NewStyle().Foreground(t.Text()) // Calculate width needed for content maxWidth := 60 // Width for explanation text diff --git a/packages/tui/internal/components/dialog/models.go b/packages/tui/internal/components/dialog/models.go index 5da3c9eef..52ece493f 100644 --- a/packages/tui/internal/components/dialog/models.go +++ b/packages/tui/internal/components/dialog/models.go @@ -158,7 +158,7 @@ func (m *modelDialog) getScrollIndicators(maxWidth int) string { } t := theme.CurrentTheme() - return styles.BaseStyle(). + return styles.NewStyle(). Foreground(t.TextMuted()). Width(maxWidth). Align(lipgloss.Right). diff --git a/packages/tui/internal/components/dialog/permission.go b/packages/tui/internal/components/dialog/permission.go index 1f573e59d..5bc40624b 100644 --- a/packages/tui/internal/components/dialog/permission.go +++ b/packages/tui/internal/components/dialog/permission.go @@ -145,7 +145,7 @@ func (p *permissionDialogComponent) selectCurrentOption() tea.Cmd { func (p *permissionDialogComponent) renderButtons() string { t := theme.CurrentTheme() - baseStyle := styles.BaseStyle() + baseStyle := styles.NewStyle().Foreground(t.Text()) allowStyle := baseStyle allowSessionStyle := baseStyle @@ -355,8 +355,7 @@ func (p *permissionDialogComponent) renderDefaultContent() string { func (p *permissionDialogComponent) styleViewport() string { t := theme.CurrentTheme() - contentStyle := lipgloss.NewStyle(). - Background(t.Background()) + contentStyle := styles.NewStyle().Background(t.Background()) return contentStyle.Render(p.contentViewPort.View()) } diff --git a/packages/tui/internal/components/dialog/session.go b/packages/tui/internal/components/dialog/session.go index 71f3f2e9e..6ee8d1cce 100644 --- a/packages/tui/internal/components/dialog/session.go +++ b/packages/tui/internal/components/dialog/session.go @@ -7,7 +7,6 @@ import ( "slices" tea "github.com/charmbracelet/bubbletea/v2" - "github.com/charmbracelet/lipgloss/v2" "github.com/muesli/reflow/truncate" "github.com/sst/opencode/internal/app" "github.com/sst/opencode/internal/components/list" @@ -33,7 +32,7 @@ type sessionItem struct { func (s sessionItem) Render(selected bool, width int) string { t := theme.CurrentTheme() - baseStyle := styles.BaseStyle() + baseStyle := styles.NewStyle() var text string if s.isDeleteConfirming { @@ -44,7 +43,7 @@ func (s sessionItem) Render(selected bool, width int) string { truncatedStr := truncate.StringWithTail(text, uint(width-1), "...") - var itemStyle lipgloss.Style + var itemStyle styles.Style if selected { if s.isDeleteConfirming { // Red background for delete confirmation @@ -151,9 +150,9 @@ func (s *sessionDialog) Render(background string) string { listView := s.list.View() t := theme.CurrentTheme() - helpStyle := styles.BaseStyle().PaddingLeft(1).PaddingTop(1) - helpText := styles.BaseStyle().Foreground(t.Text()).Render("x/del") - helpText = helpText + styles.BaseStyle().Background(t.BackgroundElement()).Foreground(t.TextMuted()).Render(" delete session") + helpStyle := styles.NewStyle().PaddingLeft(1).PaddingTop(1) + helpText := styles.NewStyle().Foreground(t.Text()).Render("x/del") + helpText = helpText + styles.NewStyle().Background(t.BackgroundElement()).Foreground(t.TextMuted()).Render(" delete session") helpText = helpStyle.Render(helpText) content := strings.Join([]string{listView, helpText}, "\n") diff --git a/packages/tui/internal/components/dialog/theme.go b/packages/tui/internal/components/dialog/theme.go index eea3e74e7..b6e970617 100644 --- a/packages/tui/internal/components/dialog/theme.go +++ b/packages/tui/internal/components/dialog/theme.go @@ -103,7 +103,7 @@ func NewThemeDialog() ThemeDialog { // Set the initial selection to the current theme list.SetSelectedIndex(selectedIdx) - + // Set the max width for the list to match the modal width list.SetMaxWidth(36) // 40 (modal max width) - 4 (modal padding) |