MichaelMure/git-bug
1
1
Fork 0
mirror of https://github.com/MichaelMure/git-bug.git synced 2024-12-14 17:51:44 +03:00
Code Issues Projects Releases Wiki Activity

TermUI: Remove empty borders around bug table view

Browse Source
This commit is contained in:
Yuri D'Elia 2020-07-15 12:38:24 +02:00 committed by Michael Muré
parent 324fe3b7a5
commit 6824ecf0fb
No known key found for this signature in database
GPG Key ID: A4457C029293126F
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
termui/bug_table.go
View File

@ -66,7 +66,7 @@ func (bt *bugTable) layout(g *gocui.Gui) error {
return nil return nil
} }
v, err := g.SetView(bugTableHeaderView, -1, -1, maxX, 3, 0) v, err := g.SetView(bugTableHeaderView, -1, -1, maxX, 1, 0)
if err != nil { if err != nil {
if !gocui.IsUnknownView(err) { if !gocui.IsUnknownView(err) {
@ -79,7 +79,7 @@ func (bt *bugTable) layout(g *gocui.Gui) error {
v.Clear() v.Clear()
bt.renderHeader(v, maxX) bt.renderHeader(v, maxX)
v, err = g.SetView(bugTableView, -1, 1, maxX, maxY-3, 0) v, err = g.SetView(bugTableView, -1, 0, maxX, maxY-2, 0)
if err != nil { if err != nil {
if !gocui.IsUnknownView(err) { if !gocui.IsUnknownView(err) {
@ -91,7 +91,7 @@ func (bt *bugTable) layout(g *gocui.Gui) error {
v.SelFgColor = gocui.ColorBlack v.SelFgColor = gocui.ColorBlack
} }
_, viewHeight := v.Size() viewWidth, viewHeight := v.Size()
err = bt.paginate(viewHeight) err = bt.paginate(viewHeight)
if err != nil { if err != nil {
return err return err
@ -103,9 +103,9 @@ func (bt *bugTable) layout(g *gocui.Gui) error {
} }
v.Clear() v.Clear()
bt.render(v, maxX) bt.render(v, viewWidth)
v, err = g.SetView(bugTableFooterView, -1, maxY-4, maxX, maxY, 0) v, err = g.SetView(bugTableFooterView, -1, maxY-3, maxX, maxY, 0)
if err != nil { if err != nil {
if !gocui.IsUnknownView(err) { if !gocui.IsUnknownView(err) {
@ -326,7 +326,7 @@ func (bt *bugTable) render(v *gocui.View, maxX int) {
lastEditTime := excerpt.EditTime() lastEditTime := excerpt.EditTime()
id := text.LeftPadMaxLine(excerpt.Id.Human(), columnWidths["id"], 1) id := text.LeftPadMaxLine(excerpt.Id.Human(), columnWidths["id"], 0)
status := text.LeftPadMaxLine(excerpt.Status.String(), columnWidths["status"], 1) status := text.LeftPadMaxLine(excerpt.Status.String(), columnWidths["status"], 1)
labels := text.TruncateMax(labelsTxt.String(), minInt(columnWidths["title"]-2, 10)) labels := text.TruncateMax(labelsTxt.String(), minInt(columnWidths["title"]-2, 10))
title := text.LeftPadMaxLine(strings.TrimSpace(excerpt.Title), columnWidths["title"]-text.Len(labels), 1) title := text.LeftPadMaxLine(strings.TrimSpace(excerpt.Title), columnWidths["title"]-text.Len(labels), 1)
@ -351,19 +351,18 @@ func (bt *bugTable) render(v *gocui.View, maxX int) {
func (bt *bugTable) renderHeader(v *gocui.View, maxX int) { func (bt *bugTable) renderHeader(v *gocui.View, maxX int) {
columnWidths := bt.getColumnWidths(maxX) columnWidths := bt.getColumnWidths(maxX)
id := text.LeftPadMaxLine("ID", columnWidths["id"], 1) id := text.LeftPadMaxLine("ID", columnWidths["id"], 0)
status := text.LeftPadMaxLine("STATUS", columnWidths["status"], 1) status := text.LeftPadMaxLine("STATUS", columnWidths["status"], 1)
title := text.LeftPadMaxLine("TITLE", columnWidths["title"], 1) title := text.LeftPadMaxLine("TITLE", columnWidths["title"], 1)
author := text.LeftPadMaxLine("AUTHOR", columnWidths["author"], 1) author := text.LeftPadMaxLine("AUTHOR", columnWidths["author"], 1)
comments := text.LeftPadMaxLine("COMMENTS", columnWidths["comments"], 1) comments := text.LeftPadMaxLine("COMMENTS", columnWidths["comments"], 1)
lastEdit := text.LeftPadMaxLine("LAST EDIT", columnWidths["lastEdit"], 1) lastEdit := text.LeftPadMaxLine("LAST EDIT", columnWidths["lastEdit"], 1)
_, _ = fmt.Fprintf(v, "\n")
_, _ = fmt.Fprintf(v, "%s %s %s %s %s %s\n", id, status, title, author, comments, lastEdit) _, _ = fmt.Fprintf(v, "%s %s %s %s %s %s\n", id, status, title, author, comments, lastEdit)
} }
func (bt *bugTable) renderFooter(v *gocui.View, maxX int) { func (bt *bugTable) renderFooter(v *gocui.View, maxX int) {
_, _ = fmt.Fprintf(v, " \nShowing %d of %d bugs", len(bt.excerpts), len(bt.allIds)) _, _ = fmt.Fprintf(v, " Showing %d of %d bugs", len(bt.excerpts), len(bt.allIds))
} }
func (bt *bugTable) cursorDown(g *gocui.Gui, v *gocui.View) error { func (bt *bugTable) cursorDown(g *gocui.Gui, v *gocui.View) error {