diff options
Diffstat (limited to 'runtime/ui/view')
-rw-r--r-- | runtime/ui/view/cursor.go | 2 | ||||
-rw-r--r-- | runtime/ui/view/debug.go | 7 | ||||
-rw-r--r-- | runtime/ui/view/details.go | 9 | ||||
-rw-r--r-- | runtime/ui/view/filetree.go | 6 | ||||
-rw-r--r-- | runtime/ui/view/filter.go | 9 | ||||
-rw-r--r-- | runtime/ui/view/layer.go | 2 | ||||
-rw-r--r-- | runtime/ui/view/status.go | 7 | ||||
-rw-r--r-- | runtime/ui/view/views.go | 2 |
8 files changed, 24 insertions, 20 deletions
diff --git a/runtime/ui/view/cursor.go b/runtime/ui/view/cursor.go index 7cd5bcf..a2b6b89 100644 --- a/runtime/ui/view/cursor.go +++ b/runtime/ui/view/cursor.go @@ -2,7 +2,7 @@ package view import ( "errors" - "github.com/jroimartin/gocui" + "github.com/awesome-gocui/gocui" ) // CursorDown moves the cursor down in the currently selected gocui pane, scrolling the screen as needed. diff --git a/runtime/ui/view/debug.go b/runtime/ui/view/debug.go index aab9d06..cb45676 100644 --- a/runtime/ui/view/debug.go +++ b/runtime/ui/view/debug.go @@ -2,7 +2,8 @@ package view import ( "fmt" - "github.com/jroimartin/gocui" + + "github.com/awesome-gocui/gocui" "github.com/sirupsen/logrus" "github.com/wagoodman/dive/runtime/ui/format" "github.com/wagoodman/dive/utils" @@ -103,10 +104,10 @@ func (v *Debug) Layout(g *gocui.Gui, minX, minY, maxX, maxY int) error { // header headerSize := 1 // note: maxY needs to account for the (invisible) border, thus a +1 - header, headerErr := g.SetView(v.Name()+"header", minX, minY, maxX, minY+headerSize+1) + header, headerErr := g.SetView(v.Name()+"header", minX, minY, maxX, minY+headerSize+1, 0) // we are going to overlap the view over the (invisible) border (so minY will be one less than expected). // additionally, maxY will be bumped by one to include the border - view, viewErr := g.SetView(v.Name(), minX, minY+headerSize, maxX, maxY+1) + view, viewErr := g.SetView(v.Name(), minX, minY+headerSize, maxX, maxY+1, 0) if utils.IsNewView(viewErr, headerErr) { err := v.Setup(view, header) if err != nil { diff --git a/runtime/ui/view/details.go b/runtime/ui/view/details.go index 02262d1..43ea329 100644 --- a/runtime/ui/view/details.go +++ b/runtime/ui/view/details.go @@ -2,16 +2,17 @@ package view import ( "fmt" + "strconv" + "strings" + "github.com/sirupsen/logrus" "github.com/wagoodman/dive/dive/filetree" "github.com/wagoodman/dive/dive/image" "github.com/wagoodman/dive/runtime/ui/format" "github.com/wagoodman/dive/runtime/ui/key" - "strconv" - "strings" + "github.com/awesome-gocui/gocui" "github.com/dustin/go-humanize" - "github.com/jroimartin/gocui" ) // Details holds the UI objects and data models for populating the lower-left pane. Specifically the pane that @@ -55,7 +56,7 @@ func (v *Details) Setup(view *gocui.View, header *gocui.View) error { // set controller options v.view = view v.view.Editable = false - v.view.Wrap = true + v.view.Wrap = false v.view.Highlight = false v.view.Frame = false diff --git a/runtime/ui/view/filetree.go b/runtime/ui/view/filetree.go index 863dd33..5b551c2 100644 --- a/runtime/ui/view/filetree.go +++ b/runtime/ui/view/filetree.go @@ -4,7 +4,7 @@ import ( "fmt" "regexp" - "github.com/jroimartin/gocui" + "github.com/awesome-gocui/gocui" "github.com/sirupsen/logrus" "github.com/spf13/viper" "github.com/wagoodman/dive/dive/filetree" @@ -421,10 +421,10 @@ func (v *FileTree) Layout(g *gocui.Gui, minX, minY, maxX, maxY int) error { // header + attribute header headerSize := 1 + attributeRowSize // note: maxY needs to account for the (invisible) border, thus a +1 - header, headerErr := g.SetView(v.Name()+"header", minX, minY, maxX, minY+headerSize+1) + header, headerErr := g.SetView(v.Name()+"header", minX, minY, maxX, minY+headerSize+1, 0) // we are going to overlap the view over the (invisible) border (so minY will be one less than expected). // additionally, maxY will be bumped by one to include the border - view, viewErr := g.SetView(v.Name(), minX, minY+headerSize, maxX, maxY+1) + view, viewErr := g.SetView(v.Name(), minX, minY+headerSize, maxX, maxY+1, 0) if utils.IsNewView(viewErr, headerErr) { err := v.Setup(view, header) if err != nil { diff --git a/runtime/ui/view/filter.go b/runtime/ui/view/filter.go index e8f911b..5fdf915 100644 --- a/runtime/ui/view/filter.go +++ b/runtime/ui/view/filter.go @@ -2,11 +2,12 @@ package view import ( "fmt" - "github.com/jroimartin/gocui" + "strings" + + "github.com/awesome-gocui/gocui" "github.com/sirupsen/logrus" "github.com/wagoodman/dive/runtime/ui/format" "github.com/wagoodman/dive/utils" - "strings" ) type FilterEditListener func(string) error @@ -172,8 +173,8 @@ func (v *Filter) OnLayoutChange() error { func (v *Filter) Layout(g *gocui.Gui, minX, minY, maxX, maxY int) error { logrus.Tracef("view.Layout(minX: %d, minY: %d, maxX: %d, maxY: %d) %s", minX, minY, maxX, maxY, v.Name()) - label, labelErr := g.SetView(v.Name()+"label", minX, minY, len(v.labelStr), maxY) - view, viewErr := g.SetView(v.Name(), minX+(len(v.labelStr)-1), minY, maxX, maxY) + label, labelErr := g.SetView(v.Name()+"label", minX, minY, len(v.labelStr), maxY, 0) + view, viewErr := g.SetView(v.Name(), minX+(len(v.labelStr)-1), minY, maxX, maxY, 0) if utils.IsNewView(viewErr, labelErr) { err := v.Setup(view, label) diff --git a/runtime/ui/view/layer.go b/runtime/ui/view/layer.go index 601cd78..c1f9d0c 100644 --- a/runtime/ui/view/layer.go +++ b/runtime/ui/view/layer.go @@ -2,7 +2,7 @@ package view import ( "fmt" - "github.com/jroimartin/gocui" + "github.com/awesome-gocui/gocui" "github.com/sirupsen/logrus" "github.com/spf13/viper" "github.com/wagoodman/dive/dive/image" diff --git a/runtime/ui/view/status.go b/runtime/ui/view/status.go index 87a4b46..9706280 100644 --- a/runtime/ui/view/status.go +++ b/runtime/ui/view/status.go @@ -2,13 +2,14 @@ package view import ( "fmt" + "strings" + "github.com/sirupsen/logrus" "github.com/wagoodman/dive/runtime/ui/format" "github.com/wagoodman/dive/runtime/ui/key" "github.com/wagoodman/dive/utils" - "strings" - "github.com/jroimartin/gocui" + "github.com/awesome-gocui/gocui" ) // Status holds the UI objects and data models for populating the bottom-most pane. Specifically the panel @@ -113,7 +114,7 @@ func (v *Status) KeyHelp() string { func (v *Status) Layout(g *gocui.Gui, minX, minY, maxX, maxY int) error { logrus.Tracef("view.Layout(minX: %d, minY: %d, maxX: %d, maxY: %d) %s", minX, minY, maxX, maxY, v.Name()) - view, viewErr := g.SetView(v.Name(), minX, minY, maxX, maxY) + view, viewErr := g.SetView(v.Name(), minX, minY, maxX, maxY, 0) if utils.IsNewView(viewErr) { err := v.Setup(view) if err != nil { diff --git a/runtime/ui/view/views.go b/runtime/ui/view/views.go index e336635..b1b72b8 100644 --- a/runtime/ui/view/views.go +++ b/runtime/ui/view/views.go @@ -1,7 +1,7 @@ package view import ( - "github.com/jroimartin/gocui" + "github.com/awesome-gocui/gocui" "github.com/wagoodman/dive/dive/filetree" "github.com/wagoodman/dive/dive/image" ) |