Use the DiffMargin view option to control the visibility of the diff …

…margin (changes to the option for a text view are immediately applied)
SonalBagdiya · Feb 7, 2013 · 5d066f7 · 5d066f7
1 parent e37e0b0
commit 5d066f7
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Diff/DiffMargin.cs b/Diff/DiffMargin.cs
@@ -41,12 +41,12 @@ public DiffMargin(IWpfTextView textView, ITextDocumentFactoryService textDocumen
             _textView.Closed += (sender, e) => _editorFormatMap.FormatMappingChanged -= HandleFormatMappingChanged;
             UpdateBrushes();
 
-            HandleOptionChanged(null, null);
             _textView.Options.OptionChanged += HandleOptionChanged;
 
             _gitDiffBarControl = new DiffMarginControl();
             _gitDiffBarControl.DataContext = new DiffMarginViewModel(this, _textView, textDocumentFactoryService, new GitCommands());
             _gitDiffBarControl.Width = MarginWidth;
+            UpdateVisibility();
         }
 
         /// <summary>
@@ -74,7 +74,7 @@ public bool Enabled
         {
             get
             {
-                return _textView.Options.IsSelectionMarginEnabled();
+                return _textView.Options.GetOptionValue(GitTextViewOptions.DiffMarginId);
             }
         }
 
@@ -130,6 +130,8 @@ private void HandleFormatMappingChanged(object sender, FormatItemsEventArgs e)
 
         private void HandleOptionChanged(object sender, EditorOptionChangedEventArgs e)
         {
+            if (!_isDisposed && e.OptionId == GitTextViewOptions.DiffMarginName)
+                UpdateVisibility();
         }
 
         private void UpdateBrushes()
@@ -139,6 +141,12 @@ private void UpdateBrushes()
             _removedBrush = GetBrush(_editorFormatMap.GetProperties(DiffFormatNames.Removed));
         }
 
+        private void UpdateVisibility()
+        {
+            ThrowIfDisposed();
+            _gitDiffBarControl.Visibility = Enabled ? Visibility.Visible : Visibility.Collapsed;
+        }
+
         private static Brush GetBrush(ResourceDictionary properties)
         {
             if (properties == null)