diff options
| author | Lluis Sanchez <llsan@microsoft.com> | 2019-09-12 10:36:13 +0300 |
|---|---|---|
| committer | Lluis Sanchez <llsan@microsoft.com> | 2019-09-12 10:36:13 +0300 |
| commit | 5323b887f4ed4990019137c3dcddb3cee133eb3a (patch) | |
| tree | 1cc849a379640ec4d295ff5edf7006f3dc57043a /main/src/core/MonoDevelop.Ide | |
| parent | d7528b284a921be6e2e713f23be4e52ffee4cb06 (diff) | |
Revert "Revert "[VersionControl] Document controller now reacts on file status change.""
This reverts commit 2a0dde445fd9264becdbb58606fe30fe19cc8150.
Diffstat (limited to 'main/src/core/MonoDevelop.Ide')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Documents/DocumentView.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Documents/DocumentView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Documents/DocumentView.cs index a36a92b191..935b6c5581 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Documents/DocumentView.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Documents/DocumentView.cs @@ -363,6 +363,7 @@ namespace MonoDevelop.Ide.Gui.Documents mainShellView.LostFocus += ShellContentView_LostFocus; if (IsRoot && AttachedViews.Count > 0) { CreateAttachmentsContainer (); + InitializeAttachmentsContainer (); } else shellView = mainShellView; @@ -382,12 +383,16 @@ namespace MonoDevelop.Ide.Gui.Documents int pos = 1; foreach (var attachedView in AttachedViews) attachmentsContainer.InsertView (pos++, attachedView.CreateShellView (window)); + shellView = attachmentsContainer; + } + + private void InitializeAttachmentsContainer () + {
if (activeAttachedView == this) attachmentsContainer.ActiveView = mainShellView; else attachmentsContainer.ActiveView = activeAttachedView?.ShellView; attachmentsContainer.ActiveViewChanged += AttachmentsContainer_ActiveViewChanged; - shellView = attachmentsContainer; } private void ShellContentView_GotFocus (object sender, EventArgs e) @@ -448,6 +453,7 @@ namespace MonoDevelop.Ide.Gui.Documents CreateAttachmentsContainer (); UpdateTitle (); ReplaceViewInParent (); + InitializeAttachmentsContainer (); } } else { if (attachmentsContainer != null) { |