mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-11 12:25:47 +02:00
Add a gui.tabWidth config
Affects everything that is shown in the main view, but probably mostly relevant for diffs.
This commit is contained in:
parent
e5137b86cf
commit
11616190ee
4 changed files with 15 additions and 0 deletions
|
@ -47,6 +47,10 @@ gui:
|
||||||
# One of: 'margin' (default) | 'jump'
|
# One of: 'margin' (default) | 'jump'
|
||||||
scrollOffBehavior: margin
|
scrollOffBehavior: margin
|
||||||
|
|
||||||
|
# The number of spaces per tab; used for everything that's shown in the main view, but probably mostly relevant for diffs.
|
||||||
|
# Note that when using a pager, the pager has its own tab width setting, so you need to pass it separately in the pager command.
|
||||||
|
tabWidth: 4
|
||||||
|
|
||||||
# If true, capture mouse events.
|
# If true, capture mouse events.
|
||||||
# When mouse events are captured, it's a little harder to select text: e.g. requiring you to hold the option key when on macOS.
|
# When mouse events are captured, it's a little harder to select text: e.g. requiring you to hold the option key when on macOS.
|
||||||
mouseEvents: true
|
mouseEvents: true
|
||||||
|
|
|
@ -64,6 +64,9 @@ type GuiConfig struct {
|
||||||
ScrollOffMargin int `yaml:"scrollOffMargin"`
|
ScrollOffMargin int `yaml:"scrollOffMargin"`
|
||||||
// One of: 'margin' (default) | 'jump'
|
// One of: 'margin' (default) | 'jump'
|
||||||
ScrollOffBehavior string `yaml:"scrollOffBehavior"`
|
ScrollOffBehavior string `yaml:"scrollOffBehavior"`
|
||||||
|
// The number of spaces per tab; used for everything that's shown in the main view, but probably mostly relevant for diffs.
|
||||||
|
// Note that when using a pager, the pager has its own tab width setting, so you need to pass it separately in the pager command.
|
||||||
|
TabWidth int `yaml:"tabWidth" jsonschema:"minimum=1"`
|
||||||
// If true, capture mouse events.
|
// If true, capture mouse events.
|
||||||
// When mouse events are captured, it's a little harder to select text: e.g. requiring you to hold the option key when on macOS.
|
// When mouse events are captured, it's a little harder to select text: e.g. requiring you to hold the option key when on macOS.
|
||||||
MouseEvents bool `yaml:"mouseEvents"`
|
MouseEvents bool `yaml:"mouseEvents"`
|
||||||
|
@ -693,6 +696,7 @@ func GetDefaultConfig() *UserConfig {
|
||||||
ScrollPastBottom: true,
|
ScrollPastBottom: true,
|
||||||
ScrollOffMargin: 2,
|
ScrollOffMargin: 2,
|
||||||
ScrollOffBehavior: "margin",
|
ScrollOffBehavior: "margin",
|
||||||
|
TabWidth: 4,
|
||||||
MouseEvents: true,
|
MouseEvents: true,
|
||||||
SkipDiscardChangeWarning: false,
|
SkipDiscardChangeWarning: false,
|
||||||
SkipStashWarning: false,
|
SkipStashWarning: false,
|
||||||
|
|
|
@ -203,6 +203,7 @@ func (gui *Gui) configureViewProperties() {
|
||||||
|
|
||||||
for _, view := range []*gocui.View{gui.Views.Main, gui.Views.Secondary, gui.Views.Staging, gui.Views.StagingSecondary, gui.Views.PatchBuilding, gui.Views.PatchBuildingSecondary, gui.Views.MergeConflicts} {
|
for _, view := range []*gocui.View{gui.Views.Main, gui.Views.Secondary, gui.Views.Staging, gui.Views.StagingSecondary, gui.Views.PatchBuilding, gui.Views.PatchBuildingSecondary, gui.Views.MergeConflicts} {
|
||||||
view.CanScrollPastBottom = gui.c.UserConfig().Gui.ScrollPastBottom
|
view.CanScrollPastBottom = gui.c.UserConfig().Gui.ScrollPastBottom
|
||||||
|
view.TabWidth = gui.c.UserConfig().Gui.TabWidth
|
||||||
}
|
}
|
||||||
|
|
||||||
gui.Views.CommitDescription.FgColor = theme.GocuiDefaultTextColor
|
gui.Views.CommitDescription.FgColor = theme.GocuiDefaultTextColor
|
||||||
|
|
|
@ -46,6 +46,12 @@
|
||||||
"description": "One of: 'margin' (default) | 'jump'",
|
"description": "One of: 'margin' (default) | 'jump'",
|
||||||
"default": "margin"
|
"default": "margin"
|
||||||
},
|
},
|
||||||
|
"tabWidth": {
|
||||||
|
"type": "integer",
|
||||||
|
"minimum": 1,
|
||||||
|
"description": "The number of spaces per tab; used for everything that's shown in the main view, but probably mostly relevant for diffs.\nNote that when using a pager, the pager has its own tab width setting, so you need to pass it separately in the pager command.",
|
||||||
|
"default": 4
|
||||||
|
},
|
||||||
"mouseEvents": {
|
"mouseEvents": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"description": "If true, capture mouse events.\nWhen mouse events are captured, it's a little harder to select text: e.g. requiring you to hold the option key when on macOS.",
|
"description": "If true, capture mouse events.\nWhen mouse events are captured, it's a little harder to select text: e.g. requiring you to hold the option key when on macOS.",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue