diff --git a/src/Models/DiffResult.cs b/src/Models/DiffResult.cs index 75294057..b2d91310 100644 --- a/src/Models/DiffResult.cs +++ b/src/Models/DiffResult.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using System.Text; using System.Text.RegularExpressions; diff --git a/src/ViewModels/ConfigureWorkspace.cs b/src/ViewModels/ConfigureWorkspace.cs index 047a0cc7..ec885b2f 100644 --- a/src/ViewModels/ConfigureWorkspace.cs +++ b/src/ViewModels/ConfigureWorkspace.cs @@ -54,13 +54,13 @@ namespace SourceGit.ViewModels { if (_selected == null) return; - + var idx = Workspaces.IndexOf(_selected); if (idx == 0) return; - + Workspaces.Move(idx - 1, idx); - + Preferences.Instance.Workspaces.RemoveAt(idx); Preferences.Instance.Workspaces.Insert(idx - 1, _selected); } @@ -69,13 +69,13 @@ namespace SourceGit.ViewModels { if (_selected == null) return; - + var idx = Workspaces.IndexOf(_selected); if (idx == Workspaces.Count - 1) return; - + Workspaces.Move(idx + 1, idx); - + Preferences.Instance.Workspaces.RemoveAt(idx); Preferences.Instance.Workspaces.Insert(idx + 1, _selected); } diff --git a/src/Views/CommitSubjectPresenter.cs b/src/Views/CommitSubjectPresenter.cs index 6ff72bb8..86e0fd54 100644 --- a/src/Views/CommitSubjectPresenter.cs +++ b/src/Views/CommitSubjectPresenter.cs @@ -177,7 +177,7 @@ namespace SourceGit.Views var rules = IssueTrackerRules ?? []; foreach (var rule in rules) rule.Matches(_elements, subject); - + _elements.Sort((l, r) => l.Start - r.Start); _needRebuildInlines = true; InvalidateVisual(); @@ -319,7 +319,6 @@ namespace SourceGit.Views foreground); _inlines.Add(new Inline(x, normal, null)); - x += normal.WidthIncludingTrailingWhitespace; } }