sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

Move worktrees tab to files window

Browse Source
This commit is contained in:
Jesse Duffield
2023-07-17 16:29:55 +10:00
parent 27ade502ee
commit 0604e43813
2 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
pkg/gui/gui.go
View File

@ -566,32 +566,21 @@ func (gui *Gui) initGocui(headless bool, test integrationTypes.IntegrationTest)
}
func (gui *Gui) viewTabMap() map[string][]context.TabView {
branchesTabs := []context.TabView{
{
Tab: gui.c.Tr.LocalBranchesTitle,
ViewName: "localBranches",
},
{
Tab: gui.c.Tr.RemotesTitle,
ViewName: "remotes",
},
{
Tab: gui.c.Tr.TagsTitle,
ViewName: "tags",
},
}
if gui.c.Git().Version.SupportsWorktrees() {
branchesTabs = append(branchesTabs,
context.TabView{
Tab: gui.c.Tr.WorktreesTitle,
ViewName: "worktrees",
result := map[string][]context.TabView{
"branches": {
{
Tab: gui.c.Tr.LocalBranchesTitle,
ViewName: "localBranches",
},
)
}
return map[string][]context.TabView{
"branches": branchesTabs,
{
Tab: gui.c.Tr.RemotesTitle,
ViewName: "remotes",
},
{
Tab: gui.c.Tr.TagsTitle,
ViewName: "tags",
},
},
"commits": {
{
Tab: gui.c.Tr.CommitsTitle,
@ -613,6 +602,19 @@ func (gui *Gui) viewTabMap() map[string][]context.TabView {
},
},
}
if gui.c.Git().Version.SupportsWorktrees() {
// insert between files and submodules tabs
result["files"] = append(result["files"][0:1],
context.TabView{
Tab: gui.c.Tr.WorktreesTitle,
ViewName: "worktrees",
},
result["files"][1],
)
}
return result
}
// Run: setup the gui with keybindings and start the mainloop