dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-21 02:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feature: double tap specific branch

Browse source
This commit is contained in:
Nathan Baulch 2025-06-13 10:28:28 +10:00
parent 05757ebf40
commit 3a662c0f40
3 changed files with 61 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/ViewModels/Histories.cs
View file

@ -214,8 +214,47 @@ namespace SourceGit.ViewModels
}
}
public void DoubleTapped(Models.Commit commit)
public void DoubleTapped(Models.Commit commit, Models.Decorator decorator = null)
{
if (decorator != null)
{
if (decorator.Type == Models.DecoratorType.LocalBranchHead)
{
var b = _repo.Branches.Find(x => x.FriendlyName == decorator.Name);
if (b != null)
{
_repo.CheckoutBranch(b);
return;
}
}
else if (decorator.Type == Models.DecoratorType.RemoteBranchHead)
{
var remoteBranch = _repo.Branches.Find(x => x.FriendlyName == decorator.Name);
if (remoteBranch != null)
{
var localBranch = _repo.Branches.Find(x => x.IsLocal && x.Upstream == remoteBranch.FullName);
if (localBranch != null)
{
if (localBranch.IsCurrent)
return;
if (localBranch.TrackStatus.Behind.Count == 0)
_repo.CheckoutBranch(localBranch);
else if (localBranch.TrackStatus.Ahead.Count == 0)
{
if (_repo.CanCreatePopup())
_repo.ShowPopup(new CheckoutAndFastForward(_repo, localBranch, remoteBranch));
}
else
{
if (_repo.CanCreatePopup())
_repo.ShowPopup(new CreateBranch(_repo, remoteBranch));
}
return;
}
}
}
}
if (commit == null || commit.IsCurrentHead)
return;

16
src/Views/CommitRefsPresenter.cs
View file

@ -156,6 +156,22 @@ namespace SourceGit.Views
InvalidateMeasure();
}
public Models.Decorator DecoratorAt(Point point)
{
if (DataContext is not Models.Commit commit)
return null;
var x = 0.0;
for (var i = 0; i < _items.Count; i++)
{
x += _items[i].Width + 4;
if (point.X < x)
return commit.Decorators[i];
}
return null;
}
protected override Size MeasureOverride(Size availableSize)
{
_items.Clear();

6
src/Views/Histories.axaml.cs
View file

@ -182,10 +182,14 @@ namespace SourceGit.Views
{
if (DataContext is ViewModels.Histories histories && sender is ListBox { SelectedItems.Count: 1 })
{
Models.Decorator decorator = null;
if (e.Source is CommitRefsPresenter crp)
decorator = crp.DecoratorAt(e.GetPosition(crp));
var source = e.Source as Control;
var item = source.FindAncestorOfType<ListBoxItem>();
if (item is { DataContext: Models.Commit commit })
histories.DoubleTapped(commit);
histories.DoubleTapped(commit, decorator);
}
e.Handled = true;
}