Skip to content

Add ColumnSeperator option for table widget #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
monsterxx03 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add ColumnSeperator option for table widget #246

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 27 additions & 24 deletions v3/widgets/table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,27 @@ import (
*/
type Table struct {
Block
Rows [][]string
ColumnWidths []int
TextStyle Style
RowSeparator bool
TextAlignment Alignment
RowStyles map[int]Style
FillRow bool
Rows [][]string
ColumnWidths []int
TextStyle Style
ColumnSeparator bool
RowSeparator bool
TextAlignment Alignment
RowStyles map[int]Style
FillRow bool

// ColumnResizer is called on each Draw. Can be used for custom column sizing.
ColumnResizer func()
}

func NewTable() *Table {
return &Table{
Block: *NewBlock(),
TextStyle: Theme.Table.Text,
RowSeparator: true,
RowStyles: make(map[int]Style),
ColumnResizer: func() {},
Block: *NewBlock(),
TextStyle: Theme.Table.Text,
ColumnSeparator: true,
RowSeparator: true,
RowStyles: make(map[int]Style),
ColumnResizer: func() {},
}
}

Expand Down Expand Up @@ -110,20 +112,21 @@ func (self *Table) Draw(buf *Buffer) {
// draw vertical separators
separatorStyle := self.Block.BorderStyle

separatorXCoordinate := self.Inner.Min.X
verticalCell := NewCell(VERTICAL_LINE, separatorStyle)
for i, width := range columnWidths {
if self.FillRow && i < len(columnWidths)-1 {
verticalCell.Style.Bg = rowStyle.Bg
} else {
verticalCell.Style.Bg = self.Block.BorderStyle.Bg
}
if self.ColumnSeparator {
separatorXCoordinate := self.Inner.Min.X
verticalCell := NewCell(VERTICAL_LINE, separatorStyle)
for i, width := range columnWidths {
if self.FillRow && i < len(columnWidths)-1 {
verticalCell.Style.Bg = rowStyle.Bg
} else {
verticalCell.Style.Bg = self.Block.BorderStyle.Bg
}

separatorXCoordinate += width
buf.SetCell(verticalCell, image.Pt(separatorXCoordinate, yCoordinate))
separatorXCoordinate++
separatorXCoordinate += width
buf.SetCell(verticalCell, image.Pt(separatorXCoordinate, yCoordinate))
separatorXCoordinate++
}
}

yCoordinate++

// draw horizontal separator
Expand Down