dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-23 03:14:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Enable tooltips for the commit hashes when handling conflicts

Browse source 
Now you cna hover over the commit hash to see a tooltip like you can
for the parent hash in the commit information window
This commit is contained in:
Sebastian Parborg 2025-03-06 14:18:12 +01:00
parent e3cc987682
commit 09309ce86a
3 changed files with 72 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ViewModels/Repository.cs
View file

@ -821,6 +821,11 @@ namespace SourceGit.ViewModels
} }
} }
public Models.Commit GetCommitInfo(string sha)
{
return new Commands.QuerySingleCommit(_fullpath, sha).Result();
}
public void NavigateToCurrentHead() public void NavigateToCurrentHead()
{ {
if (_currentBranch != null) if (_currentBranch != null)

36
src/Views/WorkingCopy.axaml
View file

@ -216,7 +216,23 @@
Foreground="DarkOrange" Foreground="DarkOrange"
TextDecorations="Underline" TextDecorations="Underline"
Cursor="Hand" Cursor="Hand"
PointerPressed="OnPressedSHA"/> PointerPressed="OnPressedSHA"
PointerEntered="OnSHAPointerEntered"
ToolTip.ShowDelay="0">
<TextBlock.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>
</TextBlock.DataTemplates>
</TextBlock>
</StackPanel> </StackPanel>
</DataTemplate> </DataTemplate>
@ -235,7 +251,23 @@
Foreground="DarkOrange" Foreground="DarkOrange"
TextDecorations="Underline" TextDecorations="Underline"
Cursor="Hand" Cursor="Hand"
PointerPressed="OnPressedSHA"/> PointerPressed="OnPressedSHA"
PointerEntered="OnSHAPointerEntered"
ToolTip.ShowDelay="0">
<TextBlock.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>
</TextBlock.DataTemplates>
</TextBlock>
<TextBlock Margin="4,0,0,0" Text="{Binding Subject}"/> <TextBlock Margin="4,0,0,0" Text="{Binding Subject}"/>
</StackPanel> </StackPanel>
</DataTemplate> </DataTemplate>

33
src/Views/WorkingCopy.axaml.cs
View file

@ -1,7 +1,10 @@
using System.Threading.Tasks;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Input; using Avalonia.Input;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.VisualTree; using Avalonia.VisualTree;
using Avalonia.Threading;
namespace SourceGit.Views namespace SourceGit.Views
{ {
@ -123,6 +126,36 @@ namespace SourceGit.Views
e.Handled = true; e.Handled = true;
} }
private void OnSHAPointerEntered(object sender, PointerEventArgs e)
{
var repoView = this.FindAncestorOfType<Repository>();
if (repoView is { DataContext: ViewModels.Repository repo } && sender is TextBlock text)
{
var commit = repo.GetCommitInfo(text.Text);
if (sender is Control control)
{
var tooltip = ToolTip.GetTip(control);
if (tooltip is Models.Commit tip_commit && tip_commit.SHA == commit.SHA)
return;
Task.Run(() =>
{
Dispatcher.UIThread.Invoke(() =>
{
if (control.IsEffectivelyVisible && control.IsPointerOver)
{
ToolTip.SetTip(control, commit);
ToolTip.SetIsOpen(control, true);
}
});
});
}
}
e.Handled = true;
}
private void OnUnstageSelectedButtonClicked(object _, RoutedEventArgs e) private void OnUnstageSelectedButtonClicked(object _, RoutedEventArgs e)
{ {
if (DataContext is ViewModels.WorkingCopy vm) if (DataContext is ViewModels.WorkingCopy vm)