diff options
author | Lluis Sanchez <lluis@xamarin.com> | 2019-07-26 16:39:32 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-26 16:39:32 +0300 |
commit | 96d2acd8edf88ee9d95f98cfaeb78a34105ceb11 (patch) | |
tree | 34b578ed8dd2b657c9fbc14037021dbc1e4e8f30 /main | |
parent | f8088eed2444782a7089a803533876b8d38deee0 (diff) | |
parent | b767d46857af3155d98a042156374680c1231b04 (diff) |
Merge pull request #8157 from mono/backport-pr-8156-to-release-8.2
[release-8.2] [Mac] Don't reshow the popover when the view has been removed from th…
Diffstat (limited to 'main')
-rw-r--r-- | main/src/addins/MacPlatform/MainToolbar/StatusBar.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs b/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs index ba3761b28b..14b858c077 100644 --- a/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs +++ b/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs @@ -700,6 +700,7 @@ namespace MonoDevelop.MacIntegration.MainToolbar public override void ViewDidMoveToWindow () { base.ViewDidMoveToWindow (); + ReconstructString (); RepositionContents (); } @@ -720,7 +721,13 @@ namespace MonoDevelop.MacIntegration.MainToolbar imageView.Image = image; if (updatePopover) { DestroyPopover (null, null); - ShowPopoverForStatusBar (); + + // Window will be null if the StatusBar has been removed from its parent + // In that case we want to destroy the popover, but we don't want to show + // it again + if (Window != null) { + ShowPopoverForStatusBar (); + } } } } |