Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion src/ViewModels/Launcher.cs
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ public void OpenRepositoryInTab(string repo, LauncherPage page)
IsUnmanaged = true
};

OpenRepositoryInTab(node, null);
OpenRepositoryInTab(node, page);
}

public void OpenRepositoryInTab(RepositoryNode node, LauncherPage page)
Expand All @@ -305,6 +305,9 @@ public void OpenRepositoryInTab(RepositoryNode node, LauncherPage page)
{
if (one.Node.Id == node.Id)
{
if (page != null && page.Node.IsRepository)
one.Node.Name = ComposeSubmoduleTitle(page, node);

ActivePage = one;
return;
}
Expand Down Expand Up @@ -354,6 +357,14 @@ public void OpenRepositoryInTab(RepositoryNode node, LauncherPage page)
page.Data = repo;
}
}
else if (page.Node.IsRepository)
{
var parent = page;
node.Name = ComposeSubmoduleTitle(parent, node);
page = new LauncherPage(node, repo);
var parentIdx = Pages.IndexOf(parent);
Pages.Insert(parentIdx + 1, page);
}
else
{
page.Node = node;
Expand Down Expand Up @@ -468,6 +479,12 @@ private void PostActivePageChanged()
CommandPalette = null;
}

private static string ComposeSubmoduleTitle(LauncherPage parent, RepositoryNode node)
{
var baseName = Path.GetFileName(node.Id);
return $"{parent.Node.Name} : {baseName}";
}

private Workspace _activeWorkspace;
private LauncherPage _activePage;
private bool _ignoreIndexChange;
Expand Down
2 changes: 1 addition & 1 deletion src/ViewModels/Repository.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1552,7 +1552,7 @@ public void OpenSubmodule(string submodule)

var root = Path.GetFullPath(Path.Combine(FullPath, submodule));
var normalizedPath = root.Replace('\\', '/').TrimEnd('/');
App.GetLauncher().OpenRepositoryInTab(normalizedPath, null);
App.GetLauncher().OpenRepositoryInTab(normalizedPath, selfPage);
}

public void AddWorktree()
Expand Down