Gopkg.toml 🔗
@@ -61,5 +61,5 @@
version = "0.7.1"
[[constraint]]
- name = "github.com/jesseduffield/gocui"
- branch = "master"
+ name = "github.com/MichaelMure/gocui"
+ branch = "master"
Revert to MichaelMure's fork of gocui
Yang Zhang created
Change summary
Gopkg.toml | 4 ++--
termui/bug_table.go | 10 +++++-----
termui/input_popup.go | 4 ++--
termui/label_select.go | 8 ++++----
termui/msg_popup.go | 4 ++--
termui/show_bug.go | 12 ++++++------
termui/termui.go | 4 ++--
7 files changed, 23 insertions(+), 23 deletions(-)
Detailed changes
termui/bug_table.go 🔗
@@ -8,8 +8,8 @@ import (
"github.com/MichaelMure/git-bug/cache"
"github.com/MichaelMure/git-bug/util/colors"
"github.com/MichaelMure/git-bug/util/text"
+ "github.com/MichaelMure/gocui"
"github.com/dustin/go-humanize"
- "github.com/jesseduffield/gocui"
)
const bugTableView = "bugTableView"
@@ -53,7 +53,7 @@ func (bt *bugTable) layout(g *gocui.Gui) error {
return nil
}
- v, err := g.SetView(bugTableHeaderView, -1, -1, maxX, 3, 0)
+ v, err := g.SetView(bugTableHeaderView, -1, -1, maxX, 3)
if err != nil {
if err != gocui.ErrUnknownView {
@@ -66,7 +66,7 @@ func (bt *bugTable) layout(g *gocui.Gui) error {
v.Clear()
bt.renderHeader(v, maxX)
- v, err = g.SetView(bugTableView, -1, 1, maxX, maxY-3, 0)
+ v, err = g.SetView(bugTableView, -1, 1, maxX, maxY-3)
if err != nil {
if err != gocui.ErrUnknownView {
@@ -97,7 +97,7 @@ func (bt *bugTable) layout(g *gocui.Gui) error {
v.Clear()
bt.render(v, maxX)
- v, err = g.SetView(bugTableFooterView, -1, maxY-4, maxX, maxY, 0)
+ v, err = g.SetView(bugTableFooterView, -1, maxY-4, maxX, maxY)
if err != nil {
if err != gocui.ErrUnknownView {
@@ -110,7 +110,7 @@ func (bt *bugTable) layout(g *gocui.Gui) error {
v.Clear()
bt.renderFooter(v, maxX)
- v, err = g.SetView(bugTableInstructionView, -1, maxY-2, maxX, maxY, 0)
+ v, err = g.SetView(bugTableInstructionView, -1, maxY-2, maxX, maxY)
if err != nil {
if err != gocui.ErrUnknownView {
termui/input_popup.go 🔗
@@ -3,7 +3,7 @@ package termui
import (
"io/ioutil"
- "github.com/jesseduffield/gocui"
+ "github.com/MichaelMure/gocui"
)
const inputPopupView = "inputPopupView"
@@ -46,7 +46,7 @@ func (ip *inputPopup) layout(g *gocui.Gui) error {
x0 := (maxX - width) / 2
y0 := (maxY - height) / 2
- v, err := g.SetView(inputPopupView, x0, y0, x0+width, y0+height, 0)
+ v, err := g.SetView(inputPopupView, x0, y0, x0+width, y0+height)
if err != nil {
if err != gocui.ErrUnknownView {
return err
termui/label_select.go 🔗
@@ -6,7 +6,7 @@ import (
"github.com/MichaelMure/git-bug/bug"
"github.com/MichaelMure/git-bug/cache"
- "github.com/jesseduffield/gocui"
+ "github.com/MichaelMure/gocui"
)
const labelSelectView = "labelSelectView"
@@ -105,7 +105,7 @@ func (ls *labelSelect) layout(g *gocui.Gui) error {
x0 := 1
y0 := 0 - ls.scroll
- v, err := g.SetView(labelSelectView, x0, 0, x0+width, maxY-2, 0)
+ v, err := g.SetView(labelSelectView, x0, 0, x0+width, maxY-2)
if err != nil {
if err != gocui.ErrUnknownView {
return err
@@ -116,7 +116,7 @@ func (ls *labelSelect) layout(g *gocui.Gui) error {
for i, label := range ls.labels {
viewname := fmt.Sprintf("view%d", i)
- v, err := g.SetView(viewname, x0+2, y0, x0+width-2, y0+2, 0)
+ v, err := g.SetView(viewname, x0+2, y0, x0+width-2, y0+2)
if err != nil && err != gocui.ErrUnknownView {
return err
}
@@ -131,7 +131,7 @@ func (ls *labelSelect) layout(g *gocui.Gui) error {
y0 += 2
}
- v, err = g.SetView(labelSelectInstructionsView, -1, maxY-2, maxX, maxY, 0)
+ v, err = g.SetView(labelSelectInstructionsView, -1, maxY-2, maxX, maxY)
ls.childViews = append(ls.childViews, labelSelectInstructionsView)
if err != nil {
if err != gocui.ErrUnknownView {
termui/msg_popup.go 🔗
@@ -4,7 +4,7 @@ import (
"fmt"
"github.com/MichaelMure/git-bug/util/text"
- "github.com/jesseduffield/gocui"
+ "github.com/MichaelMure/gocui"
)
const msgPopupView = "msgPopupView"
@@ -50,7 +50,7 @@ func (ep *msgPopup) layout(g *gocui.Gui) error {
x0 := (maxX - width) / 2
y0 := (maxY - height) / 2
- v, err := g.SetView(msgPopupView, x0, y0, x0+width, y0+height, 0)
+ v, err := g.SetView(msgPopupView, x0, y0, x0+width, y0+height)
if err != nil {
if err != gocui.ErrUnknownView {
return err
termui/show_bug.go 🔗
@@ -10,7 +10,7 @@ import (
"github.com/MichaelMure/git-bug/util/colors"
"github.com/MichaelMure/git-bug/util/git"
"github.com/MichaelMure/git-bug/util/text"
- "github.com/jesseduffield/gocui"
+ "github.com/MichaelMure/gocui"
)
const showBugView = "showBugView"
@@ -48,7 +48,7 @@ func (sb *showBug) layout(g *gocui.Gui) error {
maxX, maxY := g.Size()
sb.childViews = nil
- v, err := g.SetView(showBugView, 0, 0, maxX*2/3, maxY-2, 0)
+ v, err := g.SetView(showBugView, 0, 0, maxX*2/3, maxY-2)
if err != nil {
if err != gocui.ErrUnknownView {
@@ -65,7 +65,7 @@ func (sb *showBug) layout(g *gocui.Gui) error {
return err
}
- v, err = g.SetView(showBugSidebarView, maxX*2/3+1, 0, maxX-1, maxY-2, 0)
+ v, err = g.SetView(showBugSidebarView, maxX*2/3+1, 0, maxX-1, maxY-2)
if err != nil {
if err != gocui.ErrUnknownView {
@@ -82,7 +82,7 @@ func (sb *showBug) layout(g *gocui.Gui) error {
return err
}
- v, err = g.SetView(showBugInstructionView, -1, maxY-2, maxX, maxY, 0)
+ v, err = g.SetView(showBugInstructionView, -1, maxY-2, maxX, maxY)
if err != nil {
if err != gocui.ErrUnknownView {
@@ -382,7 +382,7 @@ func emptyMessagePlaceholder() string {
}
func (sb *showBug) createOpView(g *gocui.Gui, name string, x0 int, y0 int, maxX int, height int, selectable bool) (*gocui.View, error) {
- v, err := g.SetView(name, x0, y0, maxX, y0+height+1, 0)
+ v, err := g.SetView(name, x0, y0, maxX, y0+height+1)
if err != nil && err != gocui.ErrUnknownView {
return nil, err
@@ -402,7 +402,7 @@ func (sb *showBug) createOpView(g *gocui.Gui, name string, x0 int, y0 int, maxX
}
func (sb *showBug) createSideView(g *gocui.Gui, name string, x0 int, y0 int, maxX int, height int) (*gocui.View, error) {
- v, err := g.SetView(name, x0, y0, maxX, y0+height+1, 0)
+ v, err := g.SetView(name, x0, y0, maxX, y0+height+1)
if err != nil && err != gocui.ErrUnknownView {
return nil, err
termui/termui.go 🔗
@@ -5,7 +5,7 @@ import (
"github.com/MichaelMure/git-bug/cache"
"github.com/MichaelMure/git-bug/input"
"github.com/MichaelMure/git-bug/util/git"
- "github.com/jesseduffield/gocui"
+ "github.com/MichaelMure/gocui"
"github.com/pkg/errors"
)
@@ -69,7 +69,7 @@ func Run(cache *cache.RepoCache) error {
}
func initGui(action func(ui *termUI) error) {
- g, err := gocui.NewGui(gocui.OutputNormal, false)
+ g, err := gocui.NewGui(gocui.OutputNormal)
if err != nil {
ui.gError <- err