sashakoshka/termui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fill whole rows with row style

Browse Source
This commit is contained in:
Ryan Lewis 2019-02-01 18:12:22 +00:00
parent ddd058e89d
commit 83319fb800
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
_examples/table.go
View File

@ -54,6 +54,7 @@ func main() {
table3.RowSeparator = true table3.RowSeparator = true
table3.BorderStyle = ui.NewStyle(ui.ColorGreen) table3.BorderStyle = ui.NewStyle(ui.ColorGreen)
table3.SetRect(0, 30, 70, 20) table3.SetRect(0, 30, 70, 20)
table3.FillRow = true
table3.RowStyles[0] = ui.NewStyle(ui.ColorWhite, ui.ColorBlack, ui.ModifierBold) table3.RowStyles[0] = ui.NewStyle(ui.ColorWhite, ui.ColorBlack, ui.ModifierBold)
table3.RowStyles[2] = ui.NewStyle(ui.ColorRed) table3.RowStyles[2] = ui.NewStyle(ui.ColorRed)
table3.RowStyles[3] = ui.NewStyle(ui.ColorYellow) table3.RowStyles[3] = ui.NewStyle(ui.ColorYellow)

27
widgets/table.go
View File

@ -27,6 +27,7 @@ type Table struct {
RowSeparator bool RowSeparator bool
TextAlign Alignment TextAlign Alignment
RowStyles map[int]Style RowStyles map[int]Style
FillRow bool
} }
func NewTable() *Table { func NewTable() *Table {
@ -56,13 +57,20 @@ func (self *Table) Draw(buf *Buffer) {
for i := 0; i < len(self.Rows) && yCoordinate < self.Inner.Max.Y; i++ { for i := 0; i < len(self.Rows) && yCoordinate < self.Inner.Max.Y; i++ {
row := self.Rows[i] row := self.Rows[i]
colXCoordinate := self.Inner.Min.X colXCoordinate := self.Inner.Min.X
rowStyle := self.TextStyle
// get the row style if one exists
if style, ok := self.RowStyles[i]; ok {
rowStyle = style
}
if self.FillRow {
blankCell := NewCell(' ', rowStyle)
buf.Fill(blankCell, image.Rect(self.Inner.Min.X, yCoordinate, self.Inner.Max.X, yCoordinate+1))
}
// draw row cells // draw row cells
for j := 0; j < len(row); j++ { for j := 0; j < len(row); j++ {
rowStyle := self.TextStyle
// get the row style if one exists
if style, ok := self.RowStyles[i]; ok {
rowStyle = style
}
col := ParseText(row[j], rowStyle) col := ParseText(row[j], rowStyle)
// draw row cell // draw row cell
if len(col) > columnWidths[j] || self.TextAlign == AlignLeft { if len(col) > columnWidths[j] || self.TextAlign == AlignLeft {
@ -91,8 +99,13 @@ func (self *Table) Draw(buf *Buffer) {
} }
// draw vertical separators // draw vertical separators
separatorStyle := self.Block.BorderStyle
if self.FillRow {
separatorStyle.Bg = rowStyle.Bg
}
separatorXCoordinate := self.Inner.Min.X separatorXCoordinate := self.Inner.Min.X
verticalCell := NewCell(VERTICAL_LINE, self.Block.BorderStyle) verticalCell := NewCell(VERTICAL_LINE, separatorStyle)
for _, width := range columnWidths { for _, width := range columnWidths {
separatorXCoordinate += width separatorXCoordinate += width
buf.SetCell(verticalCell, image.Pt(separatorXCoordinate, yCoordinate)) buf.SetCell(verticalCell, image.Pt(separatorXCoordinate, yCoordinate))
@ -102,7 +115,7 @@ func (self *Table) Draw(buf *Buffer) {
yCoordinate++ yCoordinate++
// draw horizontal separator // draw horizontal separator
horizontalCell := NewCell(HORIZONTAL_LINE, self.Block.BorderStyle) horizontalCell := NewCell(HORIZONTAL_LINE, separatorStyle)
if self.RowSeparator && yCoordinate < self.Inner.Max.Y && i != len(self.Rows)-1 { if self.RowSeparator && yCoordinate < self.Inner.Max.Y && i != len(self.Rows)-1 {
buf.Fill(horizontalCell, image.Rect(self.Inner.Min.X, yCoordinate, self.Inner.Max.X, yCoordinate+1)) buf.Fill(horizontalCell, image.Rect(self.Inner.Min.X, yCoordinate, self.Inner.Max.X, yCoordinate+1))
yCoordinate++ yCoordinate++