1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-05 00:59:19 +02:00

bump gocui to be on 'simple' branch.

The master branch of gocui contains stuff I added for lazynpm which changes how
the cursor is used. This will provide some benefits to lazygit as well but I
don't yet have the motivation to make the required changed in lazygit to support it.

So we're gonna be on the branch named 'simple' rather than master until I fix that up.
This commit is contained in:
Jesse Duffield
2020-05-13 21:08:53 +10:00
parent 7ed8ee160d
commit d5db02a899
13 changed files with 282 additions and 230 deletions

View File

@ -703,7 +703,9 @@ func (g *Gui) drawTitle(v *View, fgColor, bgColor Attribute) error {
if v != g.currentView {
currentFgColor -= AttrBold
}
currentBgColor = v.SelBgColor
if v.HighlightSelectedTabWithoutFocus || v == g.CurrentView() {
currentBgColor = v.SelBgColor
}
}
if err := g.SetRune(x, v.y0, ch, currentFgColor, currentBgColor); err != nil {
return err

View File

@ -83,6 +83,8 @@ type View struct {
Tabs []string
TabIndex int
// HighlightTabWithoutFocus allows you to show which tab is selected without the view being focused
HighlightSelectedTabWithoutFocus bool
// If Frame is true, Subtitle allows to configure a subtitle for the view.
Subtitle string
@ -324,6 +326,7 @@ func (v *View) setRune(x, y int, ch rune, fgColor, bgColor Attribute) error {
ch = v.Mask
} else if v.Highlight && ry == rcy {
fgColor = fgColor | AttrBold
bgColor = bgColor | v.SelBgColor
}
termbox.SetCell(v.x0+x+1, v.y0+y+1, ch,

View File

@ -335,6 +335,7 @@ func PollEvent() Event {
event.N = len(inbuf)
}
copy(inbuf, inbuf[event.N:])
event.Bytes = append(event.Bytes, inbuf[:event.N]...)
inbuf = inbuf[:len(inbuf)-event.N]
}
if status == event_extracted {
@ -366,6 +367,7 @@ func PollEvent() Event {
event.N = len(inbuf)
}
copy(inbuf, inbuf[event.N:])
event.Bytes = append(event.Bytes, inbuf[:event.N]...)
inbuf = inbuf[:len(inbuf)-event.N]
}
if status == event_extracted {
@ -383,6 +385,7 @@ func PollEvent() Event {
event.N = len(inbuf)
}
copy(inbuf, inbuf[event.N:])
event.Bytes = append(event.Bytes, inbuf[:event.N]...)
inbuf = inbuf[:len(inbuf)-event.N]
}
if status == event_extracted {

View File

@ -26,6 +26,7 @@ type Event struct {
MouseX int // x coord of mouse
MouseY int // y coord of mouse
N int // number of bytes written when getting a raw event
Bytes []byte // byte array that triggered the event
}
// A cell, single conceptual entity on the screen. The screen is basically a 2d

View File

@ -2,14 +2,16 @@
package termbox
import "unicode/utf8"
import "bytes"
import "syscall"
import "unsafe"
import "strings"
import "strconv"
import "os"
import "io"
import (
"bytes"
"io"
"os"
"strconv"
"strings"
"syscall"
"unicode/utf8"
"unsafe"
)
// private API