diff options
author | David Karlaš <david.karlas@microsoft.com> | 2019-03-15 13:41:08 +0300 |
---|---|---|
committer | David Karlaš <david.karlas@microsoft.com> | 2019-03-15 13:41:08 +0300 |
commit | c51c1f2a491549c0902520a7330508f8abe0d406 (patch) | |
tree | e08721bf594cb2a5cf0c93edc679656f8a466484 /main/src/addins/MonoDevelop.Debugger | |
parent | 8785d85e729308bc30bac165490279e0dbebcf08 (diff) |
MD part of https://devdiv.visualstudio.com/DevDiv/_workitems/edit/802376
Main thing is in GTK fix, this change just closes it as soon as QuickInfo is requested so it closes also if debugger doesn't have new tooltip to show
Diffstat (limited to 'main/src/addins/MonoDevelop.Debugger')
-rw-r--r-- | main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.VSTextView/QuickInfo/DebuggerQuickInfoSource.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.VSTextView/QuickInfo/DebuggerQuickInfoSource.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.VSTextView/QuickInfo/DebuggerQuickInfoSource.cs index 9313ddf0cd..d490f25922 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.VSTextView/QuickInfo/DebuggerQuickInfoSource.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.VSTextView/QuickInfo/DebuggerQuickInfoSource.cs @@ -78,6 +78,8 @@ namespace MonoDevelop.Debugger.VSTextView.QuickInfo { if (DebuggingService.CurrentFrame == null) return null; + if (window != null) + await Runtime.RunInMainThread (DestroyWindow); var view = session.TextView; var textViewLines = view.TextViewLines; @@ -113,7 +115,6 @@ namespace MonoDevelop.Debugger.VSTextView.QuickInfo // and do our own thing, notice VS does same thing await session.DismissAsync (); await provider.joinableTaskContext.Factory.SwitchToMainThreadAsync (); - DestroyWindow (); this.lastView = view; val.Name = debugInfo.Text; window = new DebugValueWindow ((Gtk.Window)gtkParent.Toplevel, textDocument?.FilePath, textBuffer.CurrentSnapshot.GetLineNumberFromPosition (debugInfo.Span.GetStartPoint (textBuffer.CurrentSnapshot)), DebuggingService.CurrentFrame, val, null); |