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

feature: do NOT save visual diff context lines

Browse source
This commit is contained in:
leo 2024-08-25 11:33:38 +08:00
parent e9eb433471
commit 8f7567a060
No known key found for this signature in database
12 changed files with 21 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/ViewModels/DiffContext.cs
View file

@ -41,6 +41,12 @@ namespace SourceGit.ViewModels
private set => SetProperty(ref _content, value);
}
public int UnifiedLines
{
get => _unifiedLines;
private set => SetProperty(ref _unifiedLines, value);
}
public DiffContext(string repo, Models.DiffOption option, DiffContext previous = null)
{
_repo = repo;
@ -50,6 +56,7 @@ namespace SourceGit.ViewModels
{
_isTextDiff = previous._isTextDiff;
_content = previous._content;
_unifiedLines = previous._unifiedLines;
}
if (string.IsNullOrEmpty(_option.OrgPath) || _option.OrgPath == "/dev/null")
@ -62,20 +69,14 @@ namespace SourceGit.ViewModels
public void IncrUnified()
{
var pref = Preference.Instance;
pref.DiffViewVisualLineNumbers = pref.DiffViewVisualLineNumbers + 1;
UnifiedLines = _unifiedLines + 1;
LoadDiffContent();
}
public void DecrUnified()
{
var pref = Preference.Instance;
var unified = pref.DiffViewVisualLineNumbers - 1;
if (pref.DiffViewVisualLineNumbers != unified)
{
pref.DiffViewVisualLineNumbers = unified;
LoadDiffContent();
}
UnifiedLines = Math.Max(4, _unifiedLines - 1);
LoadDiffContent();
}
public void OpenExternalMergeTool()
@ -95,10 +96,9 @@ namespace SourceGit.ViewModels
return;
}
var unified = Preference.Instance.DiffViewVisualLineNumbers;
Task.Run(() =>
{
var latest = new Commands.Diff(_repo, _option, unified).Result();
var latest = new Commands.Diff(_repo, _option, _unifiedLines).Result();
var rs = null as object;
if (latest.TextDiff != null)
@ -233,6 +233,7 @@ namespace SourceGit.ViewModels
private readonly Models.DiffOption _option = null;
private string _title;
private string _fileModeChange = string.Empty;
private int _unifiedLines = 4;
private bool _isLoading = true;
private bool _isTextDiff = false;
private object _content = null;