go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-10 23:57:43 +02:00
Code Issues Releases Activity

bump gocui again

Browse Source
This commit is contained in:
Jesse Duffield 2021-02-11 21:31:52 +11:00
parent 862ced3bd0
commit 4b1da0cf3c
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vendor/github.com/jesseduffield/gocui/gui.go generated vendored
View File

@ -248,6 +248,9 @@ func (g *Gui) SetView(name string, x0, y0, x1, y1 int, overlaps byte) (*View, er
// SetViewBeneath sets a view stacked beneath another view // SetViewBeneath sets a view stacked beneath another view
func (g *Gui) SetViewBeneath(name string, aboveViewName string, height int) (*View, error) { func (g *Gui) SetViewBeneath(name string, aboveViewName string, height int) (*View, error) {
g.Mutexes.ViewsMutex.Lock()
defer g.Mutexes.ViewsMutex.Unlock()
aboveView, err := g.View(aboveViewName) aboveView, err := g.View(aboveViewName)
if err != nil { if err != nil {
return nil, err return nil, err
@ -315,7 +318,11 @@ func (g *Gui) ViewByPosition(x, y int) (*View, error) {
// traverse views in reverse order checking top views first // traverse views in reverse order checking top views first
for i := len(g.views); i > 0; i-- { for i := len(g.views); i > 0; i-- {
v := g.views[i-1] v := g.views[i-1]
if x > v.x0 && x < v.x1 && y > v.y0 && y < v.y1 { frameOffset := 0
if v.Frame {
frameOffset = 1
}
if x > v.x0-frameOffset && x < v.x1+frameOffset && y > v.y0-frameOffset && y < v.y1+frameOffset {
return v, nil return v, nil
} }
} }
@ -325,6 +332,9 @@ func (g *Gui) ViewByPosition(x, y int) (*View, error) {
// ViewPosition returns the coordinates of the view with the given name, or // ViewPosition returns the coordinates of the view with the given name, or
// error ErrUnknownView if a view with that name does not exist. // error ErrUnknownView if a view with that name does not exist.
func (g *Gui) ViewPosition(name string) (x0, y0, x1, y1 int, err error) { func (g *Gui) ViewPosition(name string) (x0, y0, x1, y1 int, err error) {
g.Mutexes.ViewsMutex.Lock()
defer g.Mutexes.ViewsMutex.Unlock()
for _, v := range g.views { for _, v := range g.views {
if v.name == name { if v.name == name {
return v.x0, v.y0, v.x1, v.y1, nil return v.x0, v.y0, v.x1, v.y1, nil
@ -335,6 +345,9 @@ func (g *Gui) ViewPosition(name string) (x0, y0, x1, y1 int, err error) {
// DeleteView deletes a view by name. // DeleteView deletes a view by name.
func (g *Gui) DeleteView(name string) error { func (g *Gui) DeleteView(name string) error {
g.Mutexes.ViewsMutex.Lock()
defer g.Mutexes.ViewsMutex.Unlock()
for i, v := range g.views { for i, v := range g.views {
if v.name == name { if v.name == name {
g.views = append(g.views[:i], g.views[i+1:]...) g.views = append(g.views[:i], g.views[i+1:]...)

2
vendor/github.com/jesseduffield/gocui/tcell_driver.go generated vendored
View File

@ -211,6 +211,8 @@ func pollEvent() GocuiEvent {
} }
switch dragState { switch dragState {
case NOT_DRAGGING:
return GocuiEvent{Type: eventNone}
// if we haven't released the left mouse button and we've moved the cursor then we're dragging // if we haven't released the left mouse button and we've moved the cursor then we're dragging
case MAYBE_DRAGGING: case MAYBE_DRAGGING:
if x != lastX || y != lastY { if x != lastX || y != lastY {