michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-23 20:47:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

code_style: run dotnet format to apply rules

Browse source
This commit is contained in:
leo 2024-07-23 13:58:57 +08:00
parent e0319e3f9b
commit 40d5a7c7f3
No known key found for this signature in database
6 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/App.axaml.cs
View file

@ -92,7 +92,7 @@ namespace SourceGit
var toplevel = GetTopLevel() as Window; var toplevel = GetTopLevel() as Window;
if (toplevel == null) if (toplevel == null)
return; return;
var dialog = new Views.Preference(); var dialog = new Views.Preference();
dialog.ShowDialog(toplevel); dialog.ShowDialog(toplevel);
}); });
@ -102,7 +102,7 @@ namespace SourceGit
var toplevel = GetTopLevel() as Window; var toplevel = GetTopLevel() as Window;
if (toplevel == null) if (toplevel == null)
return; return;
var dialog = new Views.Hotkeys(); var dialog = new Views.Hotkeys();
dialog.ShowDialog(toplevel); dialog.ShowDialog(toplevel);
}); });
@ -112,7 +112,7 @@ namespace SourceGit
var toplevel = GetTopLevel() as Window; var toplevel = GetTopLevel() as Window;
if (toplevel == null) if (toplevel == null)
return; return;
var dialog = new Views.About(); var dialog = new Views.About();
dialog.ShowDialog(toplevel); dialog.ShowDialog(toplevel);
}); });
@ -247,7 +247,7 @@ namespace SourceGit
var geo = Current?.FindResource(key) as StreamGeometry; var geo = Current?.FindResource(key) as StreamGeometry;
if (geo != null) if (geo != null)
icon.Data = geo; icon.Data = geo;
return icon; return icon;
} }
@ -257,7 +257,7 @@ namespace SourceGit
{ {
return desktop.MainWindow; return desktop.MainWindow;
} }
return null; return null;
} }

3
src/Commands/Diff.cs
View file

@ -14,7 +14,8 @@ namespace SourceGit.Commands
public Diff(string repo, Models.DiffOption opt, int unified) public Diff(string repo, Models.DiffOption opt, int unified)
{ {
_result.TextDiff = new Models.TextDiff() { _result.TextDiff = new Models.TextDiff()
{
Repo = repo, Repo = repo,
Option = opt, Option = opt,
}; };

2
src/Commands/QuerySingleCommit.cs
View file

@ -38,7 +38,5 @@ namespace SourceGit.Commands
return null; return null;
} }
} }
} }

2
src/Commands/QueryTrackStatus.cs
View file

@ -4,7 +4,7 @@ namespace SourceGit.Commands
{ {
public class QueryTrackStatus : Command public class QueryTrackStatus : Command
{ {
public QueryTrackStatus(string repo, string local, string upstream) public QueryTrackStatus(string repo, string local, string upstream)
{ {
WorkingDirectory = repo; WorkingDirectory = repo;
Context = repo; Context = repo;

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

@ -106,7 +106,7 @@ namespace SourceGit.Views
if (ShowAsDateTime) if (ShowAsDateTime)
StopTimer(); StopTimer();
else else
StartTimer(); StartTimer();
} }
} }

12
src/Views/TextDiffView.axaml.cs
View file

@ -37,9 +37,9 @@ namespace SourceGit.Views
if (old == null) if (old == null)
return true; return true;
return Math.Abs(Y - old.Y) > 0.001 || return Math.Abs(Y - old.Y) > 0.001 ||
Math.Abs(Height - old.Height) > 0.001 || Math.Abs(Height - old.Height) > 0.001 ||
StartIdx != old.StartIdx || StartIdx != old.StartIdx ||
EndIdx != old.EndIdx || EndIdx != old.EndIdx ||
Combined != Combined || Combined != Combined ||
IsOldSide != IsOldSide; IsOldSide != IsOldSide;
@ -1217,7 +1217,7 @@ namespace SourceGit.Views
} }
} }
private void OnDiscardChunk(object sender, RoutedEventArgs e) private void OnDiscardChunk(object sender, RoutedEventArgs e)
{ {
var chunk = SelectedChunk; var chunk = SelectedChunk;
if (chunk == null) if (chunk == null)
@ -1260,12 +1260,12 @@ namespace SourceGit.Views
if (change.Index == Models.ChangeState.Added) if (change.Index == Models.ChangeState.Added)
{ {
diff.GenerateNewPatchFromSelection(change, null, selection, true, tmpFile); diff.GenerateNewPatchFromSelection(change, null, selection, true, tmpFile);
} }
else if (chunk.Combined) else if (chunk.Combined)
{ {
var treeGuid = new Commands.QueryStagedFileBlobGuid(diff.Repo, change.Path).Result(); var treeGuid = new Commands.QueryStagedFileBlobGuid(diff.Repo, change.Path).Result();
diff.GeneratePatchFromSelection(change, treeGuid, selection, true, tmpFile); diff.GeneratePatchFromSelection(change, treeGuid, selection, true, tmpFile);
} }
else else
{ {
var treeGuid = new Commands.QueryStagedFileBlobGuid(diff.Repo, change.Path).Result(); var treeGuid = new Commands.QueryStagedFileBlobGuid(diff.Repo, change.Path).Result();