Merge pull request #53765 from Cosifne/dev/shech/InheritanceMarginFix…

…Focus

Move focus back to text editor when Inheritance Margin is closed

src/VisualStudio/Core/Def/Implementation/InheritanceMargin/InheritanceGlyphFactory.cs

@@ -44,17 +44,14 @@ public InheritanceGlyphFactory(
                 var membersOnLine = inheritanceMarginTag.MembersOnLine;
                 Contract.ThrowIfTrue(membersOnLine.IsEmpty);
 
-                // ZoomLevel of textView is percentage based. (e.g. 20 -> 400 means 20% -> 400%)
-                // and the scaleFactor of CrispImage is 1 based. (e.g 1 means 100%)
-                var scaleFactor = _textView.ZoomLevel / 100;
                 return new MarginGlyph.InheritanceMargin(
                     _threadingContext,
                     _streamingFindUsagesPresenter,
                     _classificationTypeMap,
                     _classificationFormatMap,
                     _waitIndicator,
                     inheritanceMarginTag,
-                    scaleFactor);
+                    _textView);
             }
 
             return null;

src/VisualStudio/Core/Def/Implementation/InheritanceMargin/MarginGlyph/InheritanceMargin.xaml.cs

@@ -16,6 +16,7 @@
 using Microsoft.CodeAnalysis.Internal.Log;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Text.Classification;
+using Microsoft.VisualStudio.Text.Editor;
 
 namespace Microsoft.VisualStudio.LanguageServices.Implementation.InheritanceMargin.MarginGlyph
 {
@@ -25,6 +26,7 @@ internal partial class InheritanceMargin
         private readonly IStreamingFindUsagesPresenter _streamingFindUsagesPresenter;
         private readonly IWaitIndicator _waitIndicator;
         private readonly Workspace _workspace;
+        private readonly IWpfTextView _textView;
 
         public InheritanceMargin(
             IThreadingContext threadingContext,
@@ -33,14 +35,18 @@ public InheritanceMargin(
             IClassificationFormatMap classificationFormatMap,
             IWaitIndicator waitIndicator,
             InheritanceMarginTag tag,
-            double scaleFactor)
+            IWpfTextView textView)
         {
             _threadingContext = threadingContext;
             _streamingFindUsagesPresenter = streamingFindUsagesPresenter;
             _workspace = tag.Workspace;
             _waitIndicator = waitIndicator;
+            _textView = textView;
             InitializeComponent();
 
+            // ZoomLevel of textView is percentage based. (e.g. 20 -> 400 means 20% -> 400%)
+            // and the scaleFactor of CrispImage is 1 based. (e.g 1 means 100%)
+            var scaleFactor = textView.ZoomLevel;
             var viewModel = InheritanceMarginViewModel.Create(classificationTypeMap, classificationFormatMap, tag, scaleFactor);
             DataContext = viewModel;
             ContextMenu.DataContext = viewModel;
@@ -99,6 +105,9 @@ private void InheritanceMargin_OnMouseLeave(object sender, MouseEventArgs e)
         private void ContextMenu_OnClose(object sender, RoutedEventArgs e)
         {
             ResetBorderToInitialColor();
+            // Move the focus back to textView when the context menu is closed.
+            // It ensures the focus won't be left at the margin
+            ResetFocus();
         }
 
         private void ContextMenu_OnOpen(object sender, RoutedEventArgs e)
@@ -131,5 +140,17 @@ private void ResetBorderToInitialColor()
             this.Background = Brushes.Transparent;
             this.BorderBrush = Brushes.Transparent;
         }
+
+        private void ResetFocus()
+        {
+            if (!_textView.HasAggregateFocus)
+            {
+                var visualElement = _textView.VisualElement;
+                if (visualElement.Focusable)
+                {
+                    Keyboard.Focus(visualElement);
+                }
+            }
+        }
     }
 }