michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2025-01-23 01:36:57 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Display lines changed

Browse source
This commit is contained in:
Bernat Borràs Civil 2025-01-19 17:13:15 +01:00
parent 399bd2f12b
commit ac57c930cb
6 changed files with 32 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Commands/QueryCommitChangedLines.cs
View file

@ -31,8 +31,10 @@ namespace SourceGit.Commands
if (parts.Length >= 2) if (parts.Length >= 2)
{ {
_addedLines += int.Parse(parts[0]); bool canParseAdded = int.TryParse(parts[0], out int addedLines);
_removedLines += int.Parse(parts[1]); bool canParseRemoved = int.TryParse(parts[1], out int removedLines);
if (canParseAdded) _addedLines += addedLines;
if (canParseRemoved) _removedLines += removedLines;
} }
} }

3
src/Models/Commit.cs
View file

@ -45,6 +45,9 @@ namespace SourceGit.Models
public Thickness Margin { get; set; } = new Thickness(0); public Thickness Margin { get; set; } = new Thickness(0);
public IBrush Brush => CommitGraph.Pens[Color].Brush; public IBrush Brush => CommitGraph.Pens[Color].Brush;
public int AddedLines { get; set; } = 0;
public int RemovedLines { get; set; } = 0;
public void ParseDecorators(string data) public void ParseDecorators(string data)
{ {
if (data.Length < 3) if (data.Length < 3)

8
src/ViewModels/CommitDetail.cs
View file

@ -637,9 +637,11 @@ namespace SourceGit.ViewModels
Task.Run(() => Task.Run(() =>
{ {
var lines = new Commands.QueryCommitChangedLines(_repo.FullPath, _commit.SHA).Result(); (var addedLines, var removedLines) = new Commands.QueryCommitChangedLines(_repo.FullPath, _commit.SHA).Result();
Console.WriteLine(lines); Dispatcher.UIThread.Invoke(() => {
//Dispatcher.UIThread.Invoke(() => FullMessage = fullMessage); _commit.AddedLines = addedLines;
_commit.RemovedLines = removedLines;
});
}); });
Task.Run(() => Task.Run(() =>

21
src/Views/CommitBaseInfo.axaml
View file

@ -184,7 +184,26 @@
<!-- Stats --> <!-- Stats -->
<TextBlock Grid.Row="4" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.Stats}" /> <TextBlock Grid.Row="4" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.Stats}" />
<v:LinesChanged Grid.Row="4" Grid.Column="1" AddedLines="0" RemovedLines="0" /> <!--v:LinesChanged Grid.Row="4" Grid.Column="1" AddedCount="{Binding AddedLines}" RemovedCount="{Binding RemovedLines}" /-->
<StackPanel Grid.Row="4" Grid.Column="1" Orientation="Horizontal" Height="24">
<Border Margin="12,0,4,0" VerticalAlignment="Center" BorderBrush="Green" BorderThickness="1" CornerRadius="6">
<TextBlock VerticalAlignment="Center" Foreground="Green" Padding="3,0">
<TextBlock.Inlines>
<Run Text="+"/>
<Run Text="{Binding AddedLines}"/>
</TextBlock.Inlines>
</TextBlock>
</Border>
<Border Margin="12,0,4,0" VerticalAlignment="Center" BorderBrush="Red" BorderThickness="1" CornerRadius="6">
<TextBlock VerticalAlignment="Center" Foreground="Red" Padding="3,0">
<TextBlock.Inlines>
<Run Text="-"/>
<Run Text="{Binding RemovedLines}"/>
</TextBlock.Inlines>
</TextBlock>
</Border>
</StackPanel>
<!-- Messages --> <!-- Messages -->
<TextBlock Grid.Row="5" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.Message}" /> <TextBlock Grid.Row="5" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.Message}" />

26
src/Views/LinesChanged.axaml
View file

@ -1,26 +0,0 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:SourceGit.Views"
x:Class="SourceGit.Views.LinesChanged"
x:Name="ThisControl"
x:DataType="local:LinesChanged">
<StackPanel Orientation="Horizontal" Height="24">
<Border Margin="12,0,4,0" VerticalAlignment="Center" BorderBrush="Green" BorderThickness="1" CornerRadius="6">
<TextBlock VerticalAlignment="Center" Foreground="Green" Padding="3,0">
<TextBlock.Inlines>
<Run Text="+"/>
<Run Text="{Binding AddedLines}"/>
</TextBlock.Inlines>
</TextBlock>
</Border>
<Border Margin="12,0,4,0" VerticalAlignment="Center" BorderBrush="Red" BorderThickness="1" CornerRadius="6">
<TextBlock VerticalAlignment="Center" Foreground="Red" Padding="3,0">
<TextBlock.Inlines>
<Run Text="-"/>
<Run Text="{Binding RemovedLines}"/>
</TextBlock.Inlines>
</TextBlock>
</Border>
</StackPanel>
</UserControl>

41
src/Views/LinesChanged.axaml.cs
View file

@ -1,41 +0,0 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace SourceGit.Views
{
public partial class LinesChanged : UserControl
{
public static readonly DirectProperty<LinesChanged, int> AddedLinesProperty =
AvaloniaProperty.RegisterDirect<LinesChanged, int>(nameof(AddedLines), o => o.AddedLines);
public static readonly DirectProperty<LinesChanged, int> RemovedLinesProperty =
AvaloniaProperty.RegisterDirect<LinesChanged, int>(nameof(RemovedLines), o => o.RemovedLines);
private int _addedLines;
private int _removedLines;
public int AddedLines
{
get => _addedLines;
set => SetAndRaise(AddedLinesProperty, ref _addedLines, value);
}
public int RemovedLines
{
get => _removedLines;
set => SetAndRaise(RemovedLinesProperty, ref _removedLines, value);
}
public LinesChanged()
{
InitializeComponent();
this.DataContext = this;
}
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
}
}