small size fix and colors added

Kujtim Hoxha created 8 months ago

Change summary

internal/tui/components/logs/table.go |  4 ++++
internal/tui/layout/single.go         | 19 ++++++++++---------
internal/tui/styles/styles.go         |  4 ++++
3 files changed, 18 insertions(+), 9 deletions(-)

Detailed changes

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,

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)
 		}
 	}
 }

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
 )