diff options
author | Lluis Sanchez Gual <lluis@xamarin.com> | 2015-04-20 19:07:51 +0300 |
---|---|---|
committer | Lluis Sanchez Gual <lluis@xamarin.com> | 2015-04-20 19:07:51 +0300 |
commit | 95408b1a41b31b645f3a8c3323ab7d3ca4bff26b (patch) | |
tree | f8f137cddcb9a40499d303be95722fd2c6081bce /main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs | |
parent | b70e4e04b4e41b8ec28d7e4b220b401ecf467e7a (diff) | |
parent | de043d330a8bf5855d4d983c804cd36727cb2406 (diff) |
Merge remote-tracking branch 'origin/roslyn' into new-project-model
Diffstat (limited to 'main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs')
-rw-r--r-- | main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs index 8af679e42c..9bb7863700 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs @@ -34,10 +34,11 @@ using Gtk; using Mono.TextEditor; using Gdk; using MonoDevelop.Ide; +using MonoDevelop.Ide.Editor; namespace MonoDevelop.SourceEditor { - public class BaseWindow : Gtk.Window + class BaseWindow : Gtk.Window { public BaseWindow () : base(Gtk.WindowType.Toplevel) { @@ -64,21 +65,21 @@ namespace MonoDevelop.SourceEditor } } - public class DebugValueWindow : PopoverWindow + class DebugValueWindow : PopoverWindow { ObjectValueTreeView tree; ScrolledWindow sw; // PinWindow pinWindow; // TreeIter currentPinIter; - public DebugValueWindow (Mono.TextEditor.TextEditor editor, int offset, StackFrame frame, ObjectValue value, PinnedWatch watch): base (Gtk.WindowType.Toplevel) + public DebugValueWindow (TextEditor editor, int offset, StackFrame frame, ObjectValue value, PinnedWatch watch): base (Gtk.WindowType.Toplevel) { this.TypeHint = WindowTypeHint.PopupMenu; this.AllowShrink = false; this.AllowGrow = false; this.Decorated = false; - TransientFor = (Gtk.Window) editor.Toplevel; + TransientFor = (Gtk.Window) ((Gtk.Widget)editor).Toplevel; // Avoid getting the focus when the window is shown. We'll get it when the mouse enters the window AcceptFocus = false; @@ -99,9 +100,9 @@ namespace MonoDevelop.SourceEditor tree.AllowPinning = true; tree.RootPinAlwaysVisible = true; tree.PinnedWatch = watch; - DocumentLocation location = editor.Document.OffsetToLocation (offset); + var location = editor.OffsetToLocation (offset); tree.PinnedWatchLine = location.Line; - tree.PinnedWatchFile = ((ExtensibleTextEditor)editor).View.ContentName; + tree.PinnedWatchFile = editor.FileName; tree.AddValue (value); tree.Selection.UnselectAll (); |