- new settings options

- bug fixes
- general ui improvements

Author: AmSmart

.github/workflows/main.yml

@@ -0,0 +1,29 @@
+name: "CI / Debug Builds"
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  Debug-Builds:
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: microsoft/setup-msbuild@v1.3.1
+      - uses: nuget/setup-nuget@v1.1.1
+
+      - name: Restore NuGet Packages
+        run: nuget restore ./VSGitBlame.sln
+
+      - name: Build VSIX (Debug)
+        run: msbuild './VSGitBlame/VSGitBlame.csproj' /p:Configuration=Debug /p:Platform=AnyCPU /p:DeployExtension=false
+
+      - name: Publish VSIX Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          path: ./VSGitBlame/bin/x64/Debug/VSGitBlame.vsix
+          name: latest-x64

.github/workflows/publish.yml

@@ -0,0 +1,33 @@
+name: "Release Builds and Publish"
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  Release-Builds:
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: microsoft/setup-msbuild@v1.3.1
+      - uses: nuget/setup-nuget@v1.1.1
+
+      - name: Restore NuGet Packages
+        run: nuget restore ./VSGitBlame.sln
+
+      - name: Build VSIX (Release)
+        run: msbuild './VSGitBlame/VSGitBlame.csproj' /p:Configuration=Release /p:Platform=AnyCPU /p:DeployExtension=false
+
+      - name: Publish VSIX Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          path: ./VSGitBlame/bin/x64/Release/VSGitBlame.vsix
+          name: latest-x64
+
+      - name: Publish x64 to Marketplace
+        uses: CalvinAllen/action-vs-marketplace-publish@v1
+        with:
+          marketplace-pat: ${{ secrets.VS_MARKETPLACE_TOKEN }}
+          publish-manifest-path: ./VSGitBlame/extension.manifest.json
+          vsix-path: ./VSGitBlame/bin/x64/Release/VSGitBlame.vsix

VSGitBlame/CommitInfoAdornment.cs

@@ -12,26 +12,68 @@ public class CommitInfoAdornment
     readonly IWpfTextView _view;
     readonly IAdornmentLayer _adornmentLayer;
     readonly ITextDocument _textDocument;
+    int _lastCaretLine = -1;
 
     public CommitInfoAdornment(IWpfTextView view)
     {
         _view = view;
         _adornmentLayer = view.GetAdornmentLayer("CommitInfoAdornment");
-        _view.LayoutChanged += OnLayoutChanged;
-        _view.VisualElement.MouseLeftButtonUp += VisualElement_MouseLeftButtonUp;
         _textDocument = _view.TextBuffer.Properties.GetProperty<ITextDocument>(typeof(ITextDocument));
+
+        // Event Subscriptions
+        _view.LayoutChanged += OnLayoutChanged;
         _textDocument.FileActionOccurred += TextDocument_FileActionOccurred;
+        _view.Caret.PositionChanged += Caret_PositionChanged;
+        //_view.VisualElement.MouseLeftButtonUp += VisualElement_MouseLeftButtonUp;
+    }
+
+    private void Caret_PositionChanged(object sender, CaretPositionChangedEventArgs e)
+    {
+        int currentLine = e.NewPosition.BufferPosition.GetContainingLine().LineNumber;
+        if (currentLine != _lastCaretLine)
+        {
+            _lastCaretLine = currentLine;
+            OnCaretLineChanged(currentLine, e);
+        }
     }
 
+
     private void TextDocument_FileActionOccurred(object sender, TextDocumentFileActionEventArgs e)
     {
         GitBlamer.InvalidateCache(_textDocument.FilePath);
     }
 
+    private void OnCaretLineChanged(int lineNumber, CaretPositionChangedEventArgs e)
+    {
+        _adornmentLayer.RemoveAllAdornments();
+
+        // Only show commit info if the document is not dirty (no unsaved changes)
+        if (_textDocument.IsDirty)
+            return;
+
+        // Get the caret position in the view
+        var caretPosition = e.NewPosition.BufferPosition;
+        var textViewLine = _view.GetTextViewLineContainingBufferPosition(caretPosition);
+
+        if (textViewLine == null)
+            return;
+
+        var commitInfo = GitBlamer.GetBlame(_textDocument.FilePath, lineNumber + 1);
+
+        if (commitInfo == null)
+            return;
+
+        ShowCommitInfo(commitInfo, textViewLine);
+    }
+
     private void VisualElement_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
     {
         _adornmentLayer.RemoveAllAdornments();
 
+        // Only show commit info if the document is not dirty (no unsaved changes)
+        if (_textDocument.IsDirty)
+            return;
+
         var mousePosition = e.GetPosition(_view.VisualElement);
 
         // Get the scroll offset
@@ -80,11 +122,10 @@ void CreateVisuals(ITextViewLine line)
 
     void ShowCommitInfo(CommitInfo commitInfo, ITextViewLine line)
     {
-        double top = line.Top - 52 < 0 ? 0 : line.Top - 52;
         var container = CommitInfoViewFactory.Get(commitInfo, _adornmentLayer);
 
         Canvas.SetLeft(container, line.Right);
-        Canvas.SetTop(container, top);
+        Canvas.SetTop(container, line.Top);
 
         _adornmentLayer.RemoveAllAdornments();
         SnapshotSpan span = new SnapshotSpan(_adornmentLayer.TextView.TextSnapshot, Span.FromBounds(line.Start, line.End));

VSGitBlame/CommitInfoViewFactory.cs

@@ -7,6 +7,7 @@
 using VSGitBlame.Core;
 using System.Linq;
 using Microsoft.VisualStudio.Text.Editor;
+using Color = System.Drawing.Color;
 
 namespace VSGitBlame;
 
@@ -16,30 +17,96 @@ public static class CommitInfoViewFactory
     static TextBlock _summaryView;
     static TextBlock _commitDetailsView;
     static Image _profileIcon;
+    static StackPanel _detailsView;
+    static Border _detailsViewContainer;
 
     static bool _firstMouseMoveFired = false;
     static bool _isDetailsVisible = false;
     static IAdornmentLayer _adornmentLayer;
+    
+    private static VSGitBlamePackage _package;
+    private static CommitInfoViewOptions _options;
 
+    public static void InitializeSettings(VSGitBlamePackage package)
+    {
+        _package = package;
+        LoadSettings();
+    }
+
+    private static void LoadSettings()
+    {
+        if (_package != null)
+        {
+            _options = _package.GetDialogPage(typeof(CommitInfoViewOptions)) as CommitInfoViewOptions;
+        }
+    }
+
+    public static void RefreshSettings()
+    {
+        LoadSettings();
+        if (_options != null)
+        {
+            ApplySettings();
+        }
+    }
+
+    private static void ApplySettings()
+    {
+        if (_summaryView != null && _options != null)
+        {
+            // Apply summary view settings
+            _summaryView.FontSize = _options.SummaryFontSize;
+
+            // Override the foreground color if specified, otherwise use theme detection
+            if (_options.SummaryFontColor != Color.Transparent)
+            {
+                _summaryView.Foreground = new SolidColorBrush(System.Windows.Media.Color.FromArgb(
+                    _options.SummaryFontColor.A, 
+                    _options.SummaryFontColor.R, 
+                    _options.SummaryFontColor.G, 
+                    _options.SummaryFontColor.B));
+            }
+            else
+            {
+                // Use theme detection if no specific color is set
+                var backgroundColor = VSColorTheme.GetThemedColor(EnvironmentColors.ToolWindowBackgroundColorKey);
+                _summaryView.Foreground = backgroundColor.GetBrightness() > 0.5 ? 
+                    Brushes.DarkBlue : 
+                    Brushes.LightGray;
+            }
+        }
+
+        if (_commitDetailsView != null && _options != null)
+        {
+            // Apply details view settings
+            _commitDetailsView.FontSize = _options.DetailsFontSize;
+            _commitDetailsView.Foreground = _options.GetDetailsFontBrush();
+        }
+
+        if (_detailsView != null && _options != null)
+        {
+            // Apply background color setting
+            _detailsViewContainer.Background = _options.GetDetailsBackgroundBrush();
+        }
+    }
 
     static CommitInfoViewFactory()
     {
         #region Summary View
         var backgroundColor = VSColorTheme.GetThemedColor(EnvironmentColors.ToolWindowBackgroundColorKey);
         _summaryView = new TextBlock
         {
-            Opacity = 0.6,
+            Opacity = 0.5,
             Background = Brushes.Transparent,
             Foreground = backgroundColor.GetBrightness() > 0.5 ? Brushes.DarkBlue : Brushes.LightGray,
             FontStyle = FontStyles.Italic,
-            FontWeight = FontWeights.Bold,
+            FontWeight = FontWeights.Normal,
         };
         #endregion
 
-        #region Info View
-        var infoView = new StackPanel
+        #region Details View
+        _detailsView = new StackPanel
         {
-            Background = new SolidColorBrush(Colors.DarkBlue),
             Orientation = Orientation.Horizontal,
         };
 
@@ -49,33 +116,34 @@ static CommitInfoViewFactory()
             Height = 50,
             Margin = new Thickness(0, 0, 3, 0),
         };
-        infoView.Children.Add(_profileIcon);
+        _detailsView.Children.Add(_profileIcon);
 
         _commitDetailsView = new TextBlock
         {
             Foreground = new SolidColorBrush(Colors.White),
             FontWeight = FontWeights.Bold,
         };
-        infoView.Children.Add(_commitDetailsView);
+        _detailsView.Children.Add(_commitDetailsView);
 
-        var infoViewContainer = new Border
+        _detailsViewContainer = new Border
         {
             BorderThickness = new Thickness(1),
+            Background = new SolidColorBrush(Colors.DarkBlue),
             BorderBrush = Brushes.Transparent,
             Visibility = Visibility.Hidden,
-            Padding = new Thickness(2)
+            Padding = new Thickness(5),
         };
-        infoViewContainer.Child = infoView;
+        _detailsViewContainer.Child = _detailsView;
         #endregion
 
         #region Container
         var rootPanel = new StackPanel
         {
             Orientation = Orientation.Vertical,
-            Background = Brushes.Transparent
+            Background = Brushes.Transparent,
         };
-        rootPanel.Children.Add(infoViewContainer);
         rootPanel.Children.Add(_summaryView);
+        rootPanel.Children.Add(_detailsViewContainer);
 
         rootPanel.MouseMove += (sender, e) =>
         {
@@ -88,16 +156,15 @@ static CommitInfoViewFactory()
             if (_isDetailsVisible)
                 return;
 
-            infoViewContainer.Visibility = Visibility.Visible;
+            _detailsViewContainer.Visibility = Visibility.Visible;
             _isDetailsVisible = true;
         };
 
         rootPanel.MouseLeave += (sender, e) =>
         {
             _firstMouseMoveFired = false;
             _isDetailsVisible = false;
-            infoViewContainer.Visibility = Visibility.Hidden;
-            _container.Visibility = Visibility.Hidden;
+            _detailsViewContainer.Visibility = Visibility.Hidden;
         };
 
         _container = new Border