go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-02-03 13:21:56 +02:00
Code Issues Releases Activity

Add border config (#2344)

Browse Source 
Co-authored-by: yk-kd <yosuke.komada@gmail.com>
This commit is contained in:
yk-kd 2023-03-18 09:23:31 +09:00 committed by GitHub
parent dea279920c
commit b5d612e6d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/Config.md
View File

@ -63,6 +63,7 @@ gui:
commandLogSize: 8 commandLogSize: 8
splitDiff: 'auto' # one of 'auto' | 'always' splitDiff: 'auto' # one of 'auto' | 'always'
skipRewordInEditorWarning: false # for skipping the confirmation before launching the reword editor skipRewordInEditorWarning: false # for skipping the confirmation before launching the reword editor
border: 'single' # one of 'single' | 'double' | 'rounded' | 'hidden'
git: git:
paging: paging:
colorArg: always colorArg: always

2
pkg/config/user_config.go
View File

@ -52,6 +52,7 @@ type GuiConfig struct {
SplitDiff string `yaml:"splitDiff"` SplitDiff string `yaml:"splitDiff"`
SkipRewordInEditorWarning bool `yaml:"skipRewordInEditorWarning"` SkipRewordInEditorWarning bool `yaml:"skipRewordInEditorWarning"`
WindowSize string `yaml:"windowSize"` WindowSize string `yaml:"windowSize"`
Border string `yaml:"border"`
} }
type ThemeConfig struct { type ThemeConfig struct {
@ -382,6 +383,7 @@ func GetDefaultConfig() *UserConfig {
CommandLogSize: 8, CommandLogSize: 8,
SplitDiff: "auto", SplitDiff: "auto",
SkipRewordInEditorWarning: false, SkipRewordInEditorWarning: false,
Border: "single",
}, },
Git: GitConfig{ Git: GitConfig{
Paging: PagingConfig{ Paging: PagingConfig{

11
pkg/gui/views.go
View File

@ -114,12 +114,23 @@ func (gui *Gui) windowForView(viewName string) string {
} }
func (gui *Gui) createAllViews() error { func (gui *Gui) createAllViews() error {
frameRunes := []rune{'─', '│', '┌', '┐', '└', '┘'}
switch gui.c.UserConfig.Gui.Border {
case "double":
frameRunes = []rune{'═', '║', '╔', '╗', '╚', '╝'}
case "rounded":
frameRunes = []rune{'─', '│', '╭', '╮', '╰', '╯'}
case "hidden":
frameRunes = []rune{' ', ' ', ' ', ' ', ' ', ' '}
}
var err error var err error
for _, mapping := range gui.orderedViewNameMappings() { for _, mapping := range gui.orderedViewNameMappings() {
*mapping.viewPtr, err = gui.prepareView(mapping.name) *mapping.viewPtr, err = gui.prepareView(mapping.name)
if err != nil && !gocui.IsUnknownView(err) { if err != nil && !gocui.IsUnknownView(err) {
return err return err
} }
(*mapping.viewPtr).FrameRunes = frameRunes
} }
gui.Views.Options.FgColor = theme.OptionsColor gui.Views.Options.FgColor = theme.OptionsColor