From e6122122e924bc430f23ee2d90189eca64c19585 Mon Sep 17 00:00:00 2001 From: mjarkk Date: Sun, 5 May 2019 11:50:51 +0200 Subject: Updated the gocui package --- vendor/github.com/jesseduffield/gocui/gui.go | 19 +++++++++++++++++++ vendor/vendor.json | 7 +++---- 2 files changed, 22 insertions(+), 4 deletions(-) (limited to 'vendor') diff --git a/vendor/github.com/jesseduffield/gocui/gui.go b/vendor/github.com/jesseduffield/gocui/gui.go index d607f1e35..4ff91ec36 100644 --- a/vendor/github.com/jesseduffield/gocui/gui.go +++ b/vendor/github.com/jesseduffield/gocui/gui.go @@ -175,6 +175,17 @@ func (g *Gui) SetView(name string, x0, y0, x1, y1 int, overlaps byte) (*View, er return v, errors.Wrap(ErrUnknownView, 0) } +// SetViewBeneath sets a view stacked beneath another view +func (g *Gui) SetViewBeneath(name string, aboveViewName string, height int) (*View, error) { + aboveView, err := g.View(aboveViewName) + if err != nil { + return nil, err + } + + viewTop := aboveView.y1 + 1 + return g.SetView(name, aboveView.x0, viewTop, aboveView.x1, viewTop+height-1, 0) +} + // SetViewOnTop sets the given view on top of the existing ones. func (g *Gui) SetViewOnTop(name string) (*View, error) { for i, v := range g.views { @@ -561,6 +572,14 @@ func corner(v *View, directions byte) rune { // drawFrameCorners draws the corners of the view. func (g *Gui) drawFrameCorners(v *View, fgColor, bgColor Attribute) error { if v.y0 == v.y1 { + if !g.SupportOverlaps { + if err := g.SetRune(v.x0, v.y0, '╶', fgColor, bgColor); err != nil { + return err + } + if err := g.SetRune(v.x1, v.y0, '╴', fgColor, bgColor); err != nil { + return err + } + } return nil } diff --git a/vendor/vendor.json b/vendor/vendor.json index 8c744823d..9dba3f6a3 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -3,11 +3,10 @@ "ignore": "", "package": [ { - "checksumSHA1": "dCLAQjvVss19hSDdcLATFHKiqFI=", - "origin": "github.com/jesseduffield/lazygit/vendor/github.com/jesseduffield/gocui", + "checksumSHA1": "UeldnfsyG1ns1lAEwTdzGgNfG7o=", "path": "github.com/jesseduffield/gocui", - "revision": "af5a758d6c8637e4f2fdad4c0aed1c5362fc4d99", - "revisionTime": "2019-04-26T03:40:05Z" + "revision": "bac774b26e2192aca1d8b70506c346ad867553a2", + "revisionTime": "2019-05-05T08:56:23Z" } ], "rootPath": "github.com/jesseduffield/lazygit" -- cgit v1.2.3