go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-27 22:38:09 +02:00
Code Issues Releases Activity

better contrast

Browse Source
This commit is contained in:
Jesse Duffield
2018-08-06 16:11:29 +10:00
parent 9a3b565806
commit b1e6735d8d
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
confirmation_panel.go
View File

@@ -63,10 +63,11 @@ func createPromptPanel(g *gocui.Gui, currentView *gocui.View, title string, hand
return err return err
} }
confirmationView.Editable = true
g.Cursor = true g.Cursor = true
confirmationView.Editable = true
confirmationView.Title = title confirmationView.Title = title
confirmationView.FgColor = gocui.ColorWhite
switchFocus(g, currentView, confirmationView) switchFocus(g, currentView, confirmationView)
return setKeyBindings(g, handleYes, nil) return setKeyBindings(g, handleYes, nil)
} }
@@ -87,6 +88,7 @@ func createConfirmationPanel(g *gocui.Gui, currentView *gocui.View, title, promp
return err return err
} }
confirmationView.Title = title confirmationView.Title = title
confirmationView.FgColor = gocui.ColorWhite
renderString(g, "confirmation", prompt) renderString(g, "confirmation", prompt)
switchFocus(g, currentView, confirmationView) switchFocus(g, currentView, confirmationView)
return setKeyBindings(g, handleYes, handleNo) return setKeyBindings(g, handleYes, handleNo)

13
gui.go
View File

@@ -10,6 +10,7 @@ import (
"time" "time"
// "strings" // "strings"
"github.com/golang-collections/collections/stack" "github.com/golang-collections/collections/stack"
"github.com/jesseduffield/gocui" "github.com/jesseduffield/gocui"
) )
@@ -204,7 +205,8 @@ func keybindings(g *gocui.Gui) error {
func layout(g *gocui.Gui) error { func layout(g *gocui.Gui) error {
g.Highlight = true g.Highlight = true
g.SelFgColor = gocui.AttrBold g.SelFgColor = gocui.ColorWhite | gocui.AttrBold
g.FgColor = gocui.ColorBlack
width, height := g.Size() width, height := g.Size()
leftSideWidth := width / 3 leftSideWidth := width / 3
statusFilesBoundary := 2 statusFilesBoundary := 2
@@ -245,6 +247,7 @@ func layout(g *gocui.Gui) error {
} }
v.Title = "Diff" v.Title = "Diff"
v.Wrap = true v.Wrap = true
v.FgColor = gocui.ColorWhite
} }
if v, err := g.SetView("status", 0, 0, leftSideWidth, statusFilesBoundary, gocui.BOTTOM|gocui.RIGHT); err != nil { if v, err := g.SetView("status", 0, 0, leftSideWidth, statusFilesBoundary, gocui.BOTTOM|gocui.RIGHT); err != nil {
@@ -252,6 +255,7 @@ func layout(g *gocui.Gui) error {
return err return err
} }
v.Title = "Status" v.Title = "Status"
v.FgColor = gocui.ColorWhite
} }
filesView, err := g.SetView("files", 0, statusFilesBoundary+panelSpacing, leftSideWidth, filesBranchesBoundary, gocui.TOP|gocui.BOTTOM) filesView, err := g.SetView("files", 0, statusFilesBoundary+panelSpacing, leftSideWidth, filesBranchesBoundary, gocui.TOP|gocui.BOTTOM)
@@ -261,6 +265,7 @@ func layout(g *gocui.Gui) error {
} }
filesView.Highlight = true filesView.Highlight = true
filesView.Title = "Files" filesView.Title = "Files"
v.FgColor = gocui.ColorWhite
} }
if v, err := g.SetView("branches", 0, filesBranchesBoundary+panelSpacing, leftSideWidth, commitsBranchesBoundary, gocui.TOP|gocui.BOTTOM); err != nil { if v, err := g.SetView("branches", 0, filesBranchesBoundary+panelSpacing, leftSideWidth, commitsBranchesBoundary, gocui.TOP|gocui.BOTTOM); err != nil {
@@ -268,7 +273,7 @@ func layout(g *gocui.Gui) error {
return err return err
} }
v.Title = "Branches" v.Title = "Branches"
v.FgColor = gocui.ColorWhite
} }
if v, err := g.SetView("commits", 0, commitsBranchesBoundary+panelSpacing, leftSideWidth, commitsStashBoundary, gocui.TOP|gocui.BOTTOM); err != nil { if v, err := g.SetView("commits", 0, commitsBranchesBoundary+panelSpacing, leftSideWidth, commitsStashBoundary, gocui.TOP|gocui.BOTTOM); err != nil {
@@ -276,7 +281,7 @@ func layout(g *gocui.Gui) error {
return err return err
} }
v.Title = "Commits" v.Title = "Commits"
v.FgColor = gocui.ColorWhite
} }
if v, err := g.SetView("stash", 0, commitsStashBoundary+panelSpacing, leftSideWidth, optionsTop, gocui.TOP|gocui.RIGHT); err != nil { if v, err := g.SetView("stash", 0, commitsStashBoundary+panelSpacing, leftSideWidth, optionsTop, gocui.TOP|gocui.RIGHT); err != nil {
@@ -284,6 +289,7 @@ func layout(g *gocui.Gui) error {
return err return err
} }
v.Title = "Stash" v.Title = "Stash"
v.FgColor = gocui.ColorWhite
} }
if v, err := g.SetView("options", -1, optionsTop, width, optionsTop+2, 0); err != nil { if v, err := g.SetView("options", -1, optionsTop, width, optionsTop+2, 0); err != nil {
@@ -291,6 +297,7 @@ func layout(g *gocui.Gui) error {
return err return err
} }
v.BgColor = gocui.ColorBlue v.BgColor = gocui.ColorBlue
v.FgColor = gocui.ColorWhite
v.Frame = false v.Frame = false
v.Title = "Options" v.Title = "Options"