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

refactor: use a []CellWithX instead a chan of CellWithX to make it more sense

Browse Source
This commit is contained in:
Anson Chan
2019-02-24 11:29:35 +08:00
parent 179acca35e
commit b5e7ca951a
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
widgets/paragraph.go
View File

@@ -40,8 +40,8 @@ func (self *Paragraph) Draw(buf *Buffer) {
break
}
row = TrimCells(row, self.Inner.Dx())
for signal := range BuildCellChannel(row) {
x, cell := signal.X, signal.Cell
for _, cx := range BuildCellWithXArray(row) {
x, cell := cx.X, cx.Cell
buf.SetCell(cell, image.Pt(x, y).Add(self.Inner.Min))
}
}

12
widgets/table.go
View File

@@ -74,8 +74,8 @@ func (self *Table) Draw(buf *Buffer) {
col := ParseText(row[j], rowStyle)
// draw row cell
if len(col) > columnWidths[j] || self.TextAlign == AlignLeft {
for signal := range BuildCellChannel(col) {
k, cell := signal.X, signal.Cell
for _, cx := range BuildCellWithXArray(col) {
k, cell := cx.X, cx.Cell
if k == columnWidths[j] || colXCoordinate+k == self.Inner.Max.X {
cell.Rune = ELLIPSES
buf.SetCell(cell, image.Pt(colXCoordinate+k-1, yCoordinate))
@@ -87,14 +87,14 @@ func (self *Table) Draw(buf *Buffer) {
} else if self.TextAlign == AlignCenter {
xCoordinateOffset := (columnWidths[j] - len(col)) / 2
stringXCoordinate := xCoordinateOffset + colXCoordinate
for signal := range BuildCellChannel(col) {
k, cell := signal.X, signal.Cell
for _, cx := range BuildCellWithXArray(col) {
k, cell := cx.X, cx.Cell
buf.SetCell(cell, image.Pt(stringXCoordinate+k, yCoordinate))
}
} else if self.TextAlign == AlignRight {
stringXCoordinate := MinInt(colXCoordinate+columnWidths[j], self.Inner.Max.X) - len(col)
for signal := range BuildCellChannel(col) {
k, cell := signal.X, signal.Cell
for _, cx := range BuildCellWithXArray(col) {
k, cell := cx.X, cx.Cell
buf.SetCell(cell, image.Pt(stringXCoordinate+k, yCoordinate))
}
}