From 4882ad0ad6182cd68ea41b87ac32f5b0f5214d70 Mon Sep 17 00:00:00 2001
From: goran-w <goran.wallgren@surgicalscience.com>
Date: Sat, 16 Nov 2024 13:33:10 +0100
Subject: [PATCH] Added indicator of current/total change-blocks in Diff
 toolbar

---
 src/ViewModels/DiffContext.cs | 25 ++++++++++++++++++++++++-
 src/Views/DiffView.axaml      |  7 +++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/ViewModels/DiffContext.cs b/src/ViewModels/DiffContext.cs
index 51418baf..9d3486a1 100644
--- a/src/ViewModels/DiffContext.cs
+++ b/src/ViewModels/DiffContext.cs
@@ -51,6 +51,12 @@ namespace SourceGit.ViewModels
             private set => SetProperty(ref _unifiedLines, value);
         }
 
+        public string ChangeBlockIndicator
+        {
+            get => _changeBlockIndicator;
+            private set => SetProperty(ref _changeBlockIndicator, value);
+        }
+
         public DiffContext(string repo, Models.DiffOption option, DiffContext previous = null)
         {
             _repo = repo;
@@ -88,6 +94,7 @@ namespace SourceGit.ViewModels
                     textDiff.CurrentChangeBlockIdx = 0;
                 }
             }
+            RefreshChangeBlockIndicator();
         }
 
         public void NextChange()
@@ -104,9 +111,22 @@ namespace SourceGit.ViewModels
                     textDiff.CurrentChangeBlockIdx = -1;
                     textDiff.CurrentChangeBlockIdx = textDiff.ChangeBlocks.Count - 1;
                 }
+                RefreshChangeBlockIndicator();
             }
         }
 
+        public void RefreshChangeBlockIndicator()
+        {
+            string curr = "-", tot = "-";
+            if (_content is Models.TextDiff textDiff)
+            {
+                if (textDiff.CurrentChangeBlockIdx >= 0)
+                    curr = (textDiff.CurrentChangeBlockIdx + 1).ToString();
+                tot = (textDiff.ChangeBlocks.Count).ToString();
+            }
+            ChangeBlockIndicator = curr + "/" + tot;
+        }
+
         public void ToggleFullTextDiff()
         {
             Preference.Instance.UseFullTextDiff = !Preference.Instance.UseFullTextDiff;
@@ -251,7 +271,9 @@ namespace SourceGit.ViewModels
                     FileModeChange = latest.FileModeChange;
                     Content = rs;
                     IsTextDiff = rs is Models.TextDiff;
-                });
+
+                    RefreshChangeBlockIndicator();
+                 });
             });
         }
 
@@ -315,6 +337,7 @@ namespace SourceGit.ViewModels
         private string _title;
         private string _fileModeChange = string.Empty;
         private int _unifiedLines = 4;
+        private string _changeBlockIndicator = "-/-";
         private bool _isTextDiff = false;
         private bool _ignoreWhitespace = false;
         private object _content = null;
diff --git a/src/Views/DiffView.axaml b/src/Views/DiffView.axaml
index 425018f8..4eca9de6 100644
--- a/src/Views/DiffView.axaml
+++ b/src/Views/DiffView.axaml
@@ -42,6 +42,13 @@
               <Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Up}"/>
             </Button>
 
+            <TextBlock Classes="primary" 
+                       Margin="0,0,0,0" 
+                       Text="{Binding ChangeBlockIndicator}" 
+                       FontSize="11" 
+                       TextTrimming="CharacterEllipsis"
+                       IsVisible="{Binding IsTextDiff}"/>
+
             <Button Classes="icon_button"
                     Width="28"
                     Command="{Binding NextChange}"