mirror of
https://github.com/sourcegit-scm/sourcegit.git
synced 2024-12-25 21:07:20 -08:00
feature: add tooltip for SHA in commit message presenter (#734)
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
parent
637f138d63
commit
b2e01f0d3e
4 changed files with 80 additions and 11 deletions
|
@ -211,6 +211,20 @@
|
||||||
<Setter Property="MaxWidth" Value="800"/>
|
<Setter Property="MaxWidth" Value="800"/>
|
||||||
</Style>
|
</Style>
|
||||||
</v:CommitMessagePresenter.Styles>
|
</v:CommitMessagePresenter.Styles>
|
||||||
|
|
||||||
|
<v:CommitMessagePresenter.DataTemplates>
|
||||||
|
<DataTemplate DataType="m:Commit">
|
||||||
|
<StackPanel MinWidth="400" Orientation="Vertical">
|
||||||
|
<Grid ColumnDefinitions="Auto,*,Auto">
|
||||||
|
<v:Avatar Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
|
||||||
|
<TextBlock Grid.Column="1" Classes="primary" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
|
||||||
|
<TextBlock Grid.Column="2" Classes="primary" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<TextBlock Classes="primary" Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
|
||||||
|
</StackPanel>
|
||||||
|
</DataTemplate>
|
||||||
|
</v:CommitMessagePresenter.DataTemplates>
|
||||||
</v:CommitMessagePresenter>
|
</v:CommitMessagePresenter>
|
||||||
</Grid>
|
</Grid>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
|
@ -1,12 +1,14 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
using Avalonia;
|
using Avalonia;
|
||||||
using Avalonia.Collections;
|
using Avalonia.Collections;
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
using Avalonia.Controls.Documents;
|
using Avalonia.Controls.Documents;
|
||||||
using Avalonia.Input;
|
using Avalonia.Input;
|
||||||
|
using Avalonia.Threading;
|
||||||
using Avalonia.VisualTree;
|
using Avalonia.VisualTree;
|
||||||
|
|
||||||
namespace SourceGit.Views
|
namespace SourceGit.Views
|
||||||
|
@ -43,7 +45,9 @@ namespace SourceGit.Views
|
||||||
if (change.Property == MessageProperty || change.Property == IssueTrackerRulesProperty)
|
if (change.Property == MessageProperty || change.Property == IssueTrackerRulesProperty)
|
||||||
{
|
{
|
||||||
Inlines!.Clear();
|
Inlines!.Clear();
|
||||||
|
_inlineCommits.Clear();
|
||||||
_matches = null;
|
_matches = null;
|
||||||
|
_lastHover = null;
|
||||||
ClearHoveredIssueLink();
|
ClearHoveredIssueLink();
|
||||||
|
|
||||||
var message = Message;
|
var message = Message;
|
||||||
|
@ -154,6 +158,10 @@ namespace SourceGit.Views
|
||||||
ToolTip.SetTip(this, match.Link);
|
ToolTip.SetTip(this, match.Link);
|
||||||
ToolTip.SetIsOpen(this, true);
|
ToolTip.SetIsOpen(this, true);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ProcessHoverCommitLink(match);
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -256,6 +264,52 @@ namespace SourceGit.Views
|
||||||
ClearHoveredIssueLink();
|
ClearHoveredIssueLink();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void ProcessHoverCommitLink(Models.Hyperlink link)
|
||||||
|
{
|
||||||
|
var sha = link.Link;
|
||||||
|
|
||||||
|
// If we have already queried this SHA, just use it.
|
||||||
|
if (_inlineCommits.TryGetValue(sha, out var exist))
|
||||||
|
{
|
||||||
|
if (exist != null)
|
||||||
|
{
|
||||||
|
ToolTip.SetTip(this, exist);
|
||||||
|
ToolTip.SetIsOpen(this, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var parentView = this.FindAncestorOfType<CommitBaseInfo>();
|
||||||
|
if (parentView is { DataContext: ViewModels.CommitDetail detail })
|
||||||
|
{
|
||||||
|
// Record the SHA of current viewing commit in the CommitDetail panel to determine if it is changed after
|
||||||
|
// asynchronous queries.
|
||||||
|
var lastDetailCommit = detail.Commit.SHA;
|
||||||
|
Task.Run(() =>
|
||||||
|
{
|
||||||
|
var c = detail.GetParent(sha);
|
||||||
|
Dispatcher.UIThread.Invoke(() =>
|
||||||
|
{
|
||||||
|
// Make sure the DataContext of CommitBaseInfo is not changed.
|
||||||
|
var currentParent = this.FindAncestorOfType<CommitBaseInfo>();
|
||||||
|
if (currentParent is { DataContext: ViewModels.CommitDetail currentDetail } &&
|
||||||
|
currentDetail.Commit.SHA == lastDetailCommit)
|
||||||
|
{
|
||||||
|
_inlineCommits.Add(sha, c);
|
||||||
|
|
||||||
|
// Make sure user still hovers the target SHA.
|
||||||
|
if (_lastHover == link)
|
||||||
|
{
|
||||||
|
ToolTip.SetTip(this, c);
|
||||||
|
ToolTip.SetIsOpen(this, true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void ClearHoveredIssueLink()
|
private void ClearHoveredIssueLink()
|
||||||
{
|
{
|
||||||
if (_lastHover != null)
|
if (_lastHover != null)
|
||||||
|
@ -268,5 +322,6 @@ namespace SourceGit.Views
|
||||||
|
|
||||||
private List<Models.Hyperlink> _matches = null;
|
private List<Models.Hyperlink> _matches = null;
|
||||||
private Models.Hyperlink _lastHover = null;
|
private Models.Hyperlink _lastHover = null;
|
||||||
|
private Dictionary<string, Models.Commit> _inlineCommits = new();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue