Skip to content

Commit

Permalink
Change check mark from emoji to simple txt
Browse files Browse the repository at this point in the history
  • Loading branch information
mkchoi212 committed Jan 1, 2018
1 parent 38f82ee commit eccb198
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions layout.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,18 @@ func makePanels(g *gocui.Gui) error {
}
}

if _, err := g.SetView(Current, x0, y0, x1, y1); err != nil {
if v, err := g.SetView(Current, x0, y0, x1, y1); err != nil {
if err != gocui.ErrUnknownView {
return err
}
v.Wrap = true
}

if _, err := g.SetView(Foreign, x2, y2, x3, y3); err != nil {
if v, err := g.SetView(Foreign, x2, y2, x3, y3); err != nil {
if err != gocui.ErrUnknownView {
return err
}
v.Wrap = true
}

return nil
Expand Down Expand Up @@ -142,7 +144,7 @@ func Select(c *conflict.Conflict, g *gocui.Gui, showHelp bool) error {
for idx, conflict := range conflict.All {
var out string
if conflict.Choice != 0 {
out = color.Green(color.Regular, " %s:%d", conflict.FileName, conflict.Start)
out = color.Green(color.Regular, " %s:%d", conflict.FileName, conflict.Start)
} else {
out = color.Red(color.Regular, "%d. %s:%d", idx+1, conflict.FileName, conflict.Start)
}
Expand Down

0 comments on commit eccb198

Please sign in to comment.