deblan-mirror/dive
1
0
Fork 0
mirror of https://github.com/wagoodman/dive synced 2026-03-14 14:25:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix overselection of layers (#585)

Browse source
This commit is contained in:
Alex Goodman 2025-03-29 10:28:51 -04:00 • committed by GitHub
commit 8483e30080
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
runtime/ui/format/format.go
View file

@ -46,17 +46,25 @@ var (
StatusControlNormal func(...interface{}) string
CompareTop func(...interface{}) string
CompareBottom func(...interface{}) string
reset = color.New(color.Reset).Sprint("")
)
func init() {
Selected = color.New(color.ReverseVideo, color.Bold).SprintFunc()
Header = color.New(color.Bold).SprintFunc()
StatusSelected = color.New(color.BgMagenta, color.FgWhite).SprintFunc()
StatusNormal = color.New(color.ReverseVideo).SprintFunc()
StatusControlSelected = color.New(color.BgMagenta, color.FgWhite, color.Bold).SprintFunc()
StatusControlNormal = color.New(color.ReverseVideo, color.Bold).SprintFunc()
CompareTop = color.New(color.BgMagenta).SprintFunc()
CompareBottom = color.New(color.BgGreen).SprintFunc()
wrapper := func(fn func(a ...any) string) func(a ...any) string {
return func(a ...any) string {
// for some reason not all color formatter functions are not applying RESET, we'll add it manually for now
return fn(a...) + reset
}
}
Selected = wrapper(color.New(color.ReverseVideo, color.Bold).SprintFunc())
Header = wrapper(color.New(color.Bold).SprintFunc())
StatusSelected = wrapper(color.New(color.BgMagenta, color.FgWhite).SprintFunc())
StatusNormal = wrapper(color.New(color.ReverseVideo).SprintFunc())
StatusControlSelected = wrapper(color.New(color.BgMagenta, color.FgWhite, color.Bold).SprintFunc())
StatusControlNormal = wrapper(color.New(color.ReverseVideo, color.Bold).SprintFunc())
CompareTop = wrapper(color.New(color.BgMagenta).SprintFunc())
CompareBottom = wrapper(color.New(color.BgGreen).SprintFunc())
}
func RenderNoHeader(width int, selected bool) string {

1
runtime/ui/view/layer.go
View file

@ -2,7 +2,6 @@ package view
import (
"fmt"
"github.com/awesome-gocui/gocui"
"github.com/sirupsen/logrus"
"github.com/spf13/viper"