diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2013-08-24 12:12:00 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2013-08-24 12:12:00 +0400 |
| commit | 9aaf42c3fd0cc86f972e9fe667a5e2af8ff90b17 (patch) | |
| tree | d5ab2af705c5dc85cb13acd10f614c46cf04f959 /main/src | |
| parent | 4d6ca58b66c31a7a364aa7202877aa9831e5681a (diff) | |
[SourceEditor] Ensure that popup window is destroyed, when message
text marker gets removed.
Diffstat (limited to 'main/src')
2 files changed, 4 insertions, 4 deletions
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs index ba947c5798..a90c4c6cb0 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs @@ -245,7 +245,7 @@ namespace MonoDevelop.SourceEditor return true; } - void DestroyPopoverWindow () + internal void DestroyPopoverWindow () { if (popoverWindow != null) { popoverWindow.Destroy (); diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs index 658f85af57..01193f187c 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs @@ -39,7 +39,7 @@ using Gtk; namespace MonoDevelop.SourceEditor { - partial class MessageBubbleTextMarker : MarginMarker, IDisposable, IActionTextLineMarker + class MessageBubbleTextMarker : MarginMarker, IDisposable, IActionTextLineMarker { readonly MessageBubbleCache cache; @@ -179,7 +179,7 @@ namespace MonoDevelop.SourceEditor public void Dispose () { DisposeLayout (); - + cache.DestroyPopoverWindow (); } internal Pango.Layout errorCountLayout; @@ -628,7 +628,7 @@ namespace MonoDevelop.SourceEditor var o = metrics.LineSegment.Offset; foreach (var task in errors.Select (t => t.Task)) { - var column = (uint)(Math.Min (Math.Max (0, task.Column - 1), metrics.LineSegment.Length)); + var column = (uint)(Math.Min (Math.Max (0, task.Column - 1), metrics.Layout.LineChars.Length)); int index = (int)metrics.Layout.TranslateToUTF8Index (column, ref curIndex, ref byteIndex); var pos = metrics.Layout.Layout.IndexToPos (index); var co = o + task.Column - 1; |