diff --git a/internal/tui/components/logs/table.go b/internal/tui/components/logs/table.go index 0387af83b48c94b6b77c0ae753b1e939393d128e..c268fc686d792df06145cc1332e4a0e5b735fa7d 100644 --- a/internal/tui/components/logs/table.go +++ b/internal/tui/components/logs/table.go @@ -10,6 +10,7 @@ import ( "github.com/kujtimiihoxha/termai/internal/logging" "github.com/kujtimiihoxha/termai/internal/pubsub" "github.com/kujtimiihoxha/termai/internal/tui/layout" + "github.com/kujtimiihoxha/termai/internal/tui/styles" ) type TableComponent interface { @@ -122,8 +123,11 @@ func NewLogsTable() TableComponent { {Title: "Message", Width: 10}, {Title: "Attributes", Width: 10}, } + defaultStyles := table.DefaultStyles() + defaultStyles.Selected = defaultStyles.Selected.Foreground(styles.Primary) tableModel := table.New( table.WithColumns(columns), + table.WithStyles(defaultStyles), ) return &tableCmp{ table: tableModel, diff --git a/internal/tui/layout/single.go b/internal/tui/layout/single.go index b8168225f1727f779333435ab04c1d47bdc982dc..95513cc62aafd12641aba162eab5d39d1906673e 100644 --- a/internal/tui/layout/single.go +++ b/internal/tui/layout/single.go @@ -93,24 +93,25 @@ func (s *singlePaneLayout) SetSize(width, height int) { s.width -= 2 s.height -= 2 } + childWidth, childHeight := s.width, s.height if s.padding != nil { if len(s.padding) == 1 { - s.width -= s.padding[0] * 2 - s.height -= s.padding[0] * 2 + childWidth -= s.padding[0] * 2 + childHeight -= s.padding[0] * 2 } else if len(s.padding) == 2 { - s.width -= s.padding[0] * 2 - s.height -= s.padding[1] * 2 + childWidth -= s.padding[0] * 2 + childHeight -= s.padding[1] * 2 } else if len(s.padding) == 3 { - s.width -= s.padding[0] * 2 - s.height -= s.padding[1] + s.padding[2] + childWidth -= s.padding[0] * 2 + childHeight -= s.padding[1] + s.padding[2] } else if len(s.padding) == 4 { - s.width -= s.padding[0] + s.padding[2] - s.height -= s.padding[1] + s.padding[3] + childWidth -= s.padding[0] + s.padding[2] + childHeight -= s.padding[1] + s.padding[3] } } if s.content != nil { if c, ok := s.content.(Sizeable); ok { - c.SetSize(s.width, s.height) + c.SetSize(childWidth, childHeight) } } } diff --git a/internal/tui/styles/styles.go b/internal/tui/styles/styles.go index a52a8a2eb92634e35ce7f4a6dd5ed413cff0e8d1..457c555d09925ea85277c92d7cea5c060ec38560 100644 --- a/internal/tui/styles/styles.go +++ b/internal/tui/styles/styles.go @@ -18,6 +18,7 @@ var ( Border = Regular.Border(lipgloss.NormalBorder()) ThickBorder = Regular.Border(lipgloss.ThickBorder()) DoubleBorder = Regular.Border(lipgloss.DoubleBorder()) + // Colors Surface0 = lipgloss.AdaptiveColor{ @@ -118,4 +119,7 @@ var ( Dark: dark.Peach().Hex, Light: light.Peach().Hex, } + + Primary = Blue + Secondary = Mauve )