Skip to content

ColSeparator flag #319

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
IgorPidik wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ColSeparator flag #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c19e015
table col separator control
IgorPidik Oct 1, 2022
e2f763c
example of borderless table
IgorPidik Oct 2, 2022
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
16 changes: 16 additions & 0 deletions _examples/table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Use of this source code is governed by a MIT license that can
// be found in the LICENSE file.

//go:build ignore
// +build ignore

package main
Expand Down Expand Up @@ -61,6 +62,21 @@ func main() {

ui.Render(table3)

borderlessTable := widgets.NewTable()
borderlessTable.Rows = [][]string{
[]string{"header1", "header2", "header3"},
[]string{"Foundations", "Go-lang is so cool", "Im working on Ruby"},
[]string{"2016", "11", "11"},
}
borderlessTable.TextStyle = ui.NewStyle(ui.ColorWhite)
borderlessTable.TextAlignment = ui.AlignCenter
borderlessTable.SetRect(0, 30, 60, 35)
borderlessTable.Border = false
borderlessTable.RowSeparator = false
borderlessTable.ColSeparator = false

ui.Render(borderlessTable)

uiEvents := ui.PollEvents()
for {
e := <-uiEvents
Expand Down
28 changes: 16 additions & 12 deletions widgets/table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ type Table struct {
ColumnWidths []int
TextStyle Style
RowSeparator bool
ColSeparator bool
TextAlignment Alignment
RowStyles map[int]Style
FillRow bool
Expand All @@ -38,6 +39,7 @@ func NewTable() *Table {
Block: *NewBlock(),
TextStyle: Theme.Table.Text,
RowSeparator: true,
ColSeparator: true,
RowStyles: make(map[int]Style),
ColumnResizer: func() {},
}
Expand Down Expand Up @@ -107,21 +109,23 @@ func (self *Table) Draw(buf *Buffer) {
colXCoordinate += columnWidths[j] + 1
}

// 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.ColSeparator {
// draw vertical separators
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++
Expand Down