remove files that are moved to Debugger.AddIn

16 years ago · 3fb5137762
16 changed files with 0 additions and 2586 deletions
--- a/src/Main/Base/Project/Src/Editor/AvalonEdit/PinLayer.cs
+++ b/src/Main/Base/Project/Src/Editor/AvalonEdit/PinLayer.cs
@ -1,225 +0,0 @@
 // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Media;
 using ICSharpCode.AvalonEdit.Editing;
 using ICSharpCode.AvalonEdit.Rendering;
 using ICSharpCode.SharpDevelop.Refactoring;
 using Services.Debugger.Tooltips;
 namespace Editor.AvalonEdit
 {
 	/// <summary>
 	/// Pin layer class. This class handles the pinning and unpinning operations.
 	/// </summary>
 	public class PinLayer : Layer
 	{
 		private Canvas pinningSurface;
 		private double verticalOffset = 0;
 		/// <summary>
 		/// PinLayer constructor.
 		/// </summary>
 		/// <param name="textArea">Text area for this layer.</param>
 		public PinLayer(TextArea textArea) : base(textArea.TextView, KnownLayer.DataPins)
 		{
 			pinningSurface = new Canvas();
 			this.Children.Add(pinningSurface);
 			textView.VisualLinesChanged += new EventHandler(textView_VisualLinesChanged);
 		}
 		/// <summary>
 		/// Pins an element;
 		/// </summary>
 		/// <param name="element">Element to pin.</param>
 		public void Pin(PinDebuggerControl element)
 		{
 			if (element == null)
 				throw new NullReferenceException("Element is null!");
 			Thumb currentThumb = new Thumb();
 			// check for saved position
 			if (!element.Mark.PinPosition.HasValue) {
 				// this is satisfied when pinning the first time
 				element.Mark.PinPosition = new Point {
 					X = element.Location.X + textView.HorizontalOffset,
 					Y = element.Location.Y + textView.VerticalOffset
 				};
 				Canvas.SetTop(currentThumb, element.Location.Y);
 				Canvas.SetLeft(currentThumb, element.Location.X);
 			}
 			else {
 				// this is satisfied when loading the pins - so we might have hidden pins
 				element.Location = new Point {
 					X = element.Mark.PinPosition.Value.X - textView.HorizontalOffset,
 					Y = element.Mark.PinPosition.Value.Y - textView.VerticalOffset
 				};				
 				Canvas.SetTop(currentThumb, element.Mark.PinPosition.Value.Y);
 				Canvas.SetLeft(currentThumb, element.Mark.PinPosition.Value.X);
 			}
 			currentThumb.Style = element.TryFindResource("PinThumbStyle") as Style;
 			currentThumb.ApplyTemplate();
 			currentThumb.DragDelta += onDragDelta;
 			currentThumb.DragStarted += currentThumb_DragStarted;
 			currentThumb.DragCompleted += currentThumb_DragCompleted;
 			var container = TryFindChild<StackPanel>(currentThumb);
 			container.Children.Add(element);
 			pinningSurface.Children.Add(currentThumb);
 		}
 		/// <summary>
 		/// Unpins an element.
 		/// </summary>
 		/// <param name="element">Element to unpin.</param>
 		public void Unpin(PinDebuggerControl element)
 		{
 			if (element == null)
 				throw new NullReferenceException("Element is null!");
 			foreach (var thumb in this.pinningSurface.Children) {
 				PinDebuggerControl pinControl = TryFindChild<PinDebuggerControl>((DependencyObject)thumb);
 				if (pinControl != null && pinControl == element)
 				{
 					pinningSurface.Children.Remove((UIElement)thumb);
 					break;
 				}
 			}
 		}
 		void textView_VisualLinesChanged(object sender, EventArgs e)
 		{
 			foreach (var ctrl in this.pinningSurface.Children) {
 				var currentThumb = ctrl as Thumb;
 				PinDebuggerControl pinControl = TryFindChild<PinDebuggerControl>(currentThumb);
 				if (pinControl != null)
 				{
 					// update relative location
 					Point location = pinControl.Location;
 					location.X -= textView.HorizontalOffset;
 					location.Y += verticalOffset - textView.VerticalOffset;
 					Canvas.SetLeft(currentThumb, location.X);
 					Canvas.SetTop(currentThumb, location.Y);
 					pinControl.Location = location;
 					pinControl.Mark.PinPosition = new Point {
 						X = location.X + textView.HorizontalOffset,
 						Y = location.Y + textView.VerticalOffset,
 					};
 				}
 			}
 			verticalOffset = textView.VerticalOffset;
 		}
 		#region Mouse move
 		void onDragDelta(object sender, DragDeltaEventArgs e)
 		{
 			Thumb currnetThumb = (Thumb)sender;
 			currnetThumb.Cursor = Cursors.Arrow;
 			double left = Canvas.GetLeft(currnetThumb) + e.HorizontalChange;
 			double top = Canvas.GetTop(currnetThumb) + e.VerticalChange;
 			Canvas.SetLeft(currnetThumb, left);
 			Canvas.SetTop(currnetThumb, top);
 		}
 		void currentThumb_DragCompleted(object sender, DragCompletedEventArgs e)
 		{
 			Thumb currnetThumb = (Thumb)sender;
 			currnetThumb.Cursor = Cursors.Arrow;
 			var pinControl = TryFindChild<PinDebuggerControl>(currnetThumb);
 			if (pinControl != null) {
 				double left = Canvas.GetLeft(currnetThumb);
 				double top = Canvas.GetTop(currnetThumb);
 				pinControl.Opacity = 1d;
 				pinControl.Location = new Point { X = left, Y = top };
 				// pin's position is with respect to the layer.
 				pinControl.Mark.PinPosition =
 					new Point
 					{
 						X = textView.HorizontalOffset + left,
 						Y = textView.VerticalOffset + top
 					};
 			}
 		}
 		void currentThumb_DragStarted(object sender, DragStartedEventArgs e)
 		{
 			Thumb currnetThumb = (Thumb)sender;
 			currnetThumb.Cursor = Cursors.Arrow;
 			var pinControl = TryFindChild<PinDebuggerControl>(currnetThumb);
 			if (pinControl != null)
 				pinControl.Opacity = 1d;
 		}
 		#endregion
 		#region Static helpers
 		static T TryFindChild<T>(DependencyObject root) where T : DependencyObject
 		{
 			return ContextActionsControl.SearchVisualTree<T>(root);
 		}
 		static T TryFindParent<T>(DependencyObject child) where T : DependencyObject
 		{
 			if (child is T) return child as T;
 			DependencyObject parentObject = GetParentObject(child);
 			if (parentObject == null) return null;
 			var parent = parentObject as T;
 			if (parent != null && parent is T)
 			{
 				return parent;
 			}
 			else
 			{
 				return TryFindParent<T>(parentObject);
 			}
 		}
 		static DependencyObject GetParentObject(DependencyObject child)
 		{
 			if (child == null) return null;
 			ContentElement contentElement = child as ContentElement;
 			if (contentElement != null)
 			{
 				DependencyObject parent = ContentOperations.GetParent(contentElement);
 				if (parent != null) return parent;
 				FrameworkContentElement fce = contentElement as FrameworkContentElement;
 				return fce != null ? fce.Parent : null;
 			}
 			FrameworkElement frameworkElement = child as FrameworkElement;
 			if (frameworkElement != null)
 			{
 				DependencyObject parent = frameworkElement.Parent;
 				if (parent != null) return parent;
 			}
 			return VisualTreeHelper.GetParent(child);
 		}
 		#endregion
 	}
 }
--- a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/DebuggerPopup.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/DebuggerPopup.cs
@ -1,100 +0,0 @@
 // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 using System;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
 namespace ICSharpCode.SharpDevelop.Debugging
 {
 	/// <summary>
 	/// Popup containing <see cref="DebuggerTooltipControl"></see>.
 	/// </summary>
 	public class DebuggerPopup : Popup
 	{
 		internal DebuggerTooltipControl contentControl;
 		public DebuggerPopup(DebuggerTooltipControl parentControl, bool showPins = true)
 		{
 			this.contentControl = new DebuggerTooltipControl(parentControl, showPins);
 			this.contentControl.containingPopup = this;
 			this.Child = this.contentControl;
 			this.IsLeaf = false;
 			//this.KeyDown += new KeyEventHandler(DebuggerPopup_KeyDown);
 			//this.contentControl.Focusable = true;
 			//Keyboard.Focus(this.contentControl);
 			//this.AllowsTransparency = true;
 			//this.PopupAnimation = PopupAnimation.Slide;
 		}
 		// attempt to propagate shortcuts to main windows when Popup is focusable (needed for keyboard scrolling + editing)
 		/*void DebuggerPopup_KeyDown(object sender, KeyEventArgs e)
 		{
 			LoggingService.Debug("Unhandled popup key down: " + e.Key);
 			RaiseEventPair(WorkbenchSingleton.MainWindow, PreviewKeyDownEvent, KeyDownEvent,
 			                           new KeyEventArgs(e.KeyboardDevice, e.InputSource, e.Timestamp, e.Key));
 		}
 		// copied from CompletionWindowBase
 		static bool RaiseEventPair(UIElement target, RoutedEvent previewEvent, RoutedEvent @event, RoutedEventArgs args)
 		{
 			if (target == null)
 				throw new ArgumentNullException("target");
 			if (previewEvent == null)
 				throw new ArgumentNullException("previewEvent");
 			if (@event == null)
 				throw new ArgumentNullException("event");
 			if (args == null)
 				throw new ArgumentNullException("args");
 			args.RoutedEvent = previewEvent;
 			target.RaiseEvent(args);
 			args.RoutedEvent = @event;
 			target.RaiseEvent(args);
 			return args.Handled;
 		}*/
 		public IEnumerable<ITreeNode> ItemsSource
 		{
 			get { return this.contentControl.ItemsSource; }
 			set { this.contentControl.SetItemsSource(value); }
 		}
 		private bool isLeaf;
 		public bool IsLeaf
 		{
 			get { return isLeaf; }
 			set
 			{
 				isLeaf = value;
 				// leaf popup closes on lost focus
 				this.StaysOpen = !isLeaf;
 			}
 		}
 		protected override void OnClosed(EventArgs e)
 		{
 			base.OnClosed(e);
 			if (isLeaf) {
 				this.contentControl.CloseOnLostFocus();
 			}
 		}
 		public void Open()
 		{
 			this.IsOpen = true;
 		}
 		public void CloseSelfAndChildren()
 		{
 			this.contentControl.CloseChildPopups();
 			this.IsOpen = false;
 		}
 	}
 }
--- a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/DebuggerTooltipControl.xaml
+++ b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/DebuggerTooltipControl.xaml
@ -1,225 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <UserControl
 	x:Class="ICSharpCode.SharpDevelop.Debugging.DebuggerTooltipControl" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:aero="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero" xmlns:debugging="clr-namespace:ICSharpCode.SharpDevelop.Debugging" xmlns:core="http://icsharpcode.net/sharpdevelop/core" xmlns:localControls="clr-namespace:Services.Debugger.Tooltips"
 	Background="Transparent">
 	<UserControl.Resources>
 		<ResourceDictionary>
 			<ResourceDictionary.MergedDictionaries>
 				<ResourceDictionary
 					Source="VisualizerPicker.xaml" />
 				<ResourceDictionary
 					Source="PinControlsDictionary.xaml" />
 			</ResourceDictionary.MergedDictionaries>
 		</ResourceDictionary>
 	</UserControl.Resources>
 	<StackPanel
 		Orientation="Vertical">
 		<RepeatButton
 			Name="btnUp"
 			Focusable="False"
 			Style="{StaticResource upButtonStyle}"
 			Content="^"
 			Click="BtnUp_Click"></RepeatButton>
 		<DataGrid
 			VerticalScrollBarVisibility="Disabled"
 			HorizontalScrollBarVisibility="Disabled"
 			GridLinesVisibility="None"
 			RowHeight="18"
 			MaxHeight="202"
 			SelectionMode="Single"
 			SelectionUnit="FullRow"
 			ItemsSource="{Binding}"
 			Name="dataGrid"
 			AutoGenerateColumns="False"
 			CanUserAddRows="False"
 			HeadersVisibility="None"
 			BorderBrush="Gray"
 			BorderThickness="1">
 			<DataGrid.Background>
 				<!-- Control backgound -->
 				<LinearGradientBrush
 					StartPoint="0,-0.03"
 					EndPoint="0,1">
 					<GradientStop
 						Color="White" />
 					<GradientStop
 						Color="#FFFAFCFE"
 						Offset="0.983" />
 					<GradientStop
 						Color="#FFECF7FC"
 						Offset="0.07" />
 					<GradientStop
 						Color="#FFEEF7FA"
 						Offset="0.436" />
 				</LinearGradientBrush>
 			</DataGrid.Background>
 			<DataGrid.RowStyle>
 				<Style
 					TargetType="{x:Type DataGridRow}">
 					<Setter
 						Property="Background"
 						Value="Transparent"></Setter>
 					<Style.Triggers>
 						<Trigger
 							Property="IsMouseOver"
 							Value="True">
 							<Setter
 								Property="Background"
 								Value="#FFE2F6FE" />
 						</Trigger>
 					</Style.Triggers>
 				</Style>
 			</DataGrid.RowStyle>
 			<DataGrid.CellStyle>
 				<Style
 					TargetType="{x:Type DataGridCell}">
 					<Setter
 						Property="Focusable"
 						Value="false" />
 					<!-- Focusable=true blocks shortcuts if cell is focused -->
 					<Setter
 						Property="BorderThickness"
 						Value="0" />
 					<Style.Triggers>
 						<Trigger
 							Property="IsSelected"
 							Value="True">
 							<!-- disable selection highlight -->
 							<Setter
 								Property="Foreground"
 								Value="Black" />
 							<Setter
 								Property="Background"
 								Value="{x:Null}" />
 						</Trigger>
 					</Style.Triggers>
 				</Style>
 			</DataGrid.CellStyle>
 			<DataGrid.Columns>
 				<DataGridTemplateColumn>
 					<!-- "Plus" expander -->
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate>
 							<Grid
 								Background="White">
 								<StackPanel
 									VerticalAlignment="Center">
 									<ToggleButton
 										x:Name="btnExpander"
 										Style="{StaticResource ExpandCollapseToggleStyle}"
 										Click="btnExpander_Click"
 										Padding="0"
 										Margin="0" />
 								</StackPanel>
 							</Grid>
 							<DataTemplate.Triggers>
 								<DataTrigger
 									Binding="{Binding Path=HasChildNodes}"
 									Value="False">
 									<Setter
 										TargetName="btnExpander"
 										Property="Visibility"
 										Value="Collapsed" />
 								</DataTrigger>
 							</DataTemplate.Triggers>
 						</DataTemplate>
 					</DataGridTemplateColumn.CellTemplate>
 				</DataGridTemplateColumn>
 				<!-- Icon -->
 				<DataGridTemplateColumn>
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate>
 							<Image
 								Source="{Binding ImageSource}"></Image>
 						</DataTemplate>
 					</DataGridTemplateColumn.CellTemplate>
 				</DataGridTemplateColumn>
 				<DataGridTemplateColumn
 					MinWidth="20"
 					Header="Name">
 					<!-- Name -->
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate>
 							<Border
 								BorderBrush="#FFDDDDDD"
 								BorderThickness="0 0 1 0">
 								<TextBlock
 									Style="{StaticResource TextBlockStyle}"
 									Text="{Binding Path=Name, Mode=OneWay}"
 									VerticalAlignment="Top"></TextBlock>
 							</Border>
 						</DataTemplate>
 					</DataGridTemplateColumn.CellTemplate>
 				</DataGridTemplateColumn>
 				<!-- Visualizer picker  -->
 				<DataGridTemplateColumn>
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate>
 							<debugging:VisualizerPicker
 								Focusable="False"
 								x:Name="visPicker"
 								ItemsSource="{Binding Path=VisualizerCommands, Mode=OneWay}"
 								Margin="4 0 0 0"></debugging:VisualizerPicker>
 							<DataTemplate.Triggers>
 								<DataTrigger
 									Binding="{Binding Path=HasVisualizerCommands}"
 									Value="False">
 									<Setter
 										TargetName="visPicker"
 										Property="Visibility"
 										Value="Collapsed" />
 								</DataTrigger>
 							</DataTemplate.Triggers>
 						</DataTemplate>
 					</DataGridTemplateColumn.CellTemplate>
 				</DataGridTemplateColumn>
 				<DataGridTemplateColumn
 					MinWidth="20"
 					Header="Text">
 					<!-- Text (value) -->
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate>
 							<TextBox
 								Style="{StaticResource TextStyle}"
 								IsEnabled="{Binding CanSetText}"
 								KeyUp="TextBox_KeyUp"
 								Text="{Binding Path=Text}" />
 						</DataTemplate>
 					</DataGridTemplateColumn.CellTemplate>
 				</DataGridTemplateColumn>
 				<DataGridTemplateColumn>
 					<!-- Pin -->
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate>
 							<ToggleButton
 								IsChecked="{Binding IsPinned}"
 								DataContext="{Binding}"
 								Visibility="Collapsed"
 								Name="PinButton"
 								VerticalAlignment="Center"
 								Checked="PinButton_Checked"
 								Unchecked="PinButton_Unchecked"
 								Template="{StaticResource PinTooltipButtonTemplate}" />
 							<DataTemplate.Triggers>
 								<DataTrigger
 									Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=DataGridRow}}"
 									Value="True">
 									<Setter
 										TargetName="PinButton"
 										Property="Visibility"
 										Value="Visible" />
 								</DataTrigger>
 							</DataTemplate.Triggers>
 						</DataTemplate>
 					</DataGridTemplateColumn.CellTemplate>
 				</DataGridTemplateColumn>
 			</DataGrid.Columns>
 		</DataGrid>
 		<RepeatButton
 			Name="btnDown"
 			Focusable="False"
 			Style="{StaticResource downButtonStyle}"
 			Content="v"
 			Click="BtnDown_Click"></RepeatButton>
 	</StackPanel>
 </UserControl>
--- a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/DebuggerTooltipControl.xaml.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/DebuggerTooltipControl.xaml.cs
@ -1,403 +0,0 @@
 // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 using System.Windows.Shapes;
 using ICSharpCode.Core;
 using ICSharpCode.NRefactory;
 using ICSharpCode.SharpDevelop.Bookmarks;
 using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.SharpDevelop.Gui;
 using Services.Debugger.Tooltips;
 namespace ICSharpCode.SharpDevelop.Debugging
 {
 	/// <summary>
 	/// Default Control used as content of SharpDevelop debugger tooltips.
 	/// </summary>
 	public partial class DebuggerTooltipControl : UserControl, ITooltip
 	{
 		private const double ChildPopupOpenXOffet = 16;
 		private const double ChildPopupOpenYOffet = 15;
 		private const int InitialItemsCount = 12;
 		private const int VisibleItemsCount = 11;
 		private bool showPins = true;
 		private LazyItemsControl<ITreeNode> lazyGrid;
 		private IEnumerable<ITreeNode> itemsSource;
 		public DebuggerTooltipControl()
 		{
 			InitializeComponent();
 			Loaded += new RoutedEventHandler(OnLoaded);
 		}
 		public DebuggerTooltipControl(ITreeNode node)
 			: this(new ITreeNode[] { node })
 		{
 		}
 		public DebuggerTooltipControl(IEnumerable<ITreeNode> nodes)
 			: this()
 		{
 			this.itemsSource = nodes;
 		}
 		public DebuggerTooltipControl(DebuggerTooltipControl parentControl, bool showPins = true)
 			: this()
 		{
 			this.parentControl = parentControl;
 			this.showPins = showPins;
 		}
 		private void OnLoaded(object sender, RoutedEventArgs e)
 		{
 			if (!showPins) {
 				dataGrid.Columns[5].Visibility = Visibility.Collapsed;
 			}
 			SetItemsSource(this.itemsSource);
 		}
 		public event RoutedEventHandler Closed;
 		protected void OnClosed()
 		{
 			if (this.Closed != null) {
 				this.Closed(this, new RoutedEventArgs());
 			}
 		}
 		public IEnumerable<ITreeNode> ItemsSource {
 			get { return this.itemsSource; }
 		}
 		public void SetItemsSource(IEnumerable<ITreeNode> value) {
 			this.itemsSource = value;
 			this.lazyGrid = new LazyItemsControl<ITreeNode>(this.dataGrid, InitialItemsCount);
 			// HACK for updating the pins in tooltip
 			var observable = new List<ITreeNode>();
 			this.itemsSource.ForEach(item => observable.Add(item));
 			// verify if at the line of the root there's a pin bookmark
 			ITextEditorProvider provider = WorkbenchSingleton.Workbench.ActiveViewContent as ITextEditorProvider;
 			var editor = provider.TextEditor;
 			if (editor != null) {
 				var pin = BookmarkManager.Bookmarks.Find(
 					b => b is PinBookmark &&
 					b.Location.Line == LogicalPosition.Line &&
 					b.FileName == editor.FileName) as PinBookmark;
 				if (pin != null) {
 					observable.ForEach(item => { // TODO: find a way not to use "observable"
 					                   	if (pin.ContainsNode(item))
 					                   		item.IsPinned = true;
 					                   });
 				}
 			}
 			var source = new VirtualizingIEnumerable<ITreeNode>(observable);
 			lazyGrid.ItemsSource = source;
 			this.dataGrid.AddHandler(ScrollViewer.ScrollChangedEvent, new ScrollChangedEventHandler(handleScroll));
 			if (this.lazyGrid.ItemsSourceTotalCount != null) {
 				// hide up/down buttons if too few items
 				btnUp.Visibility = btnDown.Visibility =
 					this.lazyGrid.ItemsSourceTotalCount.Value <= VisibleItemsCount ? Visibility.Collapsed : Visibility.Visible;
 			}
 		}
 		public Location LogicalPosition { get; set; }
 		/// <inheritdoc/>
 		public bool ShowAsPopup
 		{
 			get
 			{
 				return true;
 			}
 		}
 		/// <inheritdoc/>
 		public bool Close(bool mouseClick)
 		{
 			if (mouseClick || (!mouseClick && !isChildExpanded)) {
 				CloseChildPopups();
 				return true;
 			} else {
 				return false;
 			}
 		}
 		private DebuggerPopup childPopup { get; set; }
 		private DebuggerTooltipControl parentControl { get; set; }
 		internal DebuggerPopup containingPopup { get; set; }
 		bool isChildExpanded
 		{
 			get
 			{
 				return this.childPopup != null && this.childPopup.IsOpen;
 			}
 		}
 		private ToggleButton expandedButton;
 		/// <summary>
 		/// Closes the child popup of this control, if it exists.
 		/// </summary>
 		public void CloseChildPopups()
 		{
 			if (this.expandedButton != null) {
 				this.expandedButton.IsChecked = false;
 				this.expandedButton = null;
 				// nice simple example of indirect recursion
 				this.childPopup.CloseSelfAndChildren();
 			}
 		}
 		public void CloseOnLostFocus()
 		{
 			// when we close, parent becomes leaf
 			if (this.containingPopup != null) {
 				this.containingPopup.IsLeaf = true;
 			}
 			if (!this.IsMouseOver) {
 				if (this.containingPopup != null) {
 					this.containingPopup.IsOpen = false;
 					this.containingPopup.IsLeaf = false;
 				}
 				if (this.parentControl != null) {
 					this.parentControl.CloseOnLostFocus();
 				}
 				OnClosed();
 			} else {
 				// leaf closed because of click inside this control - stop the closing chain
 				if (this.expandedButton != null && !this.expandedButton.IsMouseOver) {
 					this.expandedButton.IsChecked = false;
 					this.expandedButton = null;
 				}
 			}
 		}
 		private void btnExpander_Click(object sender, RoutedEventArgs e)
 		{
 			var clickedButton = (ToggleButton)e.OriginalSource;
 			var clickedNode = (ITreeNode)clickedButton.DataContext;
 			// use device independent units, because child popup Left/Top are in independent units
 			Point buttonPos = clickedButton.PointToScreen(new Point(0, 0)).TransformFromDevice(clickedButton);
 			if (clickedButton.IsChecked.GetValueOrDefault(false)) {
 				CloseChildPopups();
 				this.expandedButton = clickedButton;
 				// open child Popup
 				if (this.childPopup == null) {
 					this.childPopup = new DebuggerPopup(this);
 					this.childPopup.Placement = PlacementMode.Absolute;
 					this.childPopup.contentControl.LogicalPosition = LogicalPosition;
 				}
 				if (this.containingPopup != null) {
 					this.containingPopup.IsLeaf = false;
 				}
 				this.childPopup.IsLeaf = true;
 				this.childPopup.HorizontalOffset = buttonPos.X + ChildPopupOpenXOffet;
 				this.childPopup.VerticalOffset = buttonPos.Y + ChildPopupOpenYOffet;
 				this.childPopup.ItemsSource = clickedNode.ChildNodes;
 				this.childPopup.Open();
 			} else {
 				CloseChildPopups();
 			}
 		}
 		private void handleScroll(object sender, ScrollChangedEventArgs e)
 		{
 			btnUp.IsEnabled = !this.lazyGrid.IsScrolledToStart;
 			btnDown.IsEnabled = !this.lazyGrid.IsScrolledToEnd;
 		}
 		void BtnUp_Click(object sender, RoutedEventArgs e)
 		{
 			this.lazyGrid.ScrollViewer.ScrollUp(1);
 		}
 		void BtnDown_Click(object sender, RoutedEventArgs e)
 		{
 			this.lazyGrid.ScrollViewer.ScrollDown(1);
 		}
 		#region Edit value in tooltip
 		void TextBox_KeyUp(object sender, KeyEventArgs e)
 		{
 			if (e.Key == Key.Escape) {
 				dataGrid.Focus();
 				return;
 			}
 			if (e.Key == Key.Enter) {
 				dataGrid.Focus();
 				// set new value
 				var textBox = (TextBox)e.OriginalSource;
 				var newValue = textBox.Text;
 				var node = ((FrameworkElement)sender).DataContext as ITreeNode;
 				SaveNewValue(node, textBox.Text);
 			}
 		}
 		void TextBox_LostFocus(object sender, RoutedEventArgs e)
 		{
 			var textBox = (TextBox)e.OriginalSource;
 			var newValue = textBox.Text;
 			var node = ((FrameworkElement)sender).DataContext as ITreeNode;
 			SaveNewValue(node, textBox.Text);
 		}
 		void SaveNewValue(ITreeNode node, string newValue)
 		{
 			if(node != null && node.SetText(newValue)) {
 				// show adorner
 				var adornerLayer = AdornerLayer.GetAdornerLayer(dataGrid);
 				var adorners = adornerLayer.GetAdorners(dataGrid);
 				if (adorners != null && adorners.Length != 0)
 					adornerLayer.Remove(adorners[0]);
 				SavedAdorner adorner = new SavedAdorner(dataGrid);
 				adornerLayer.Add(adorner);
 			}
 		}
 		#endregion
 		#region Pining checked/unchecked
 		void PinButton_Checked(object sender, RoutedEventArgs e)
 		{
 			ITextEditorProvider provider = WorkbenchSingleton.Workbench.ActiveViewContent as ITextEditorProvider;
 			var editor = provider.TextEditor;
 			if (editor == null) return;
 			var node = (ITreeNode)(((ToggleButton)(e.OriginalSource)).DataContext);
 			if (!string.IsNullOrEmpty(editor.FileName)) {
 				// verify if at the line of the root there's a pin bookmark
 				var pin = BookmarkManager.Bookmarks.Find(
 					b => b is PinBookmark &&
 					b.LineNumber == LogicalPosition.Line &&
 					b.FileName == editor.FileName) as PinBookmark;
 				if (pin == null) {
 					pin = new PinBookmark(editor.FileName, LogicalPosition);
 					// show pinned DebuggerPopup
 					if (pin.Popup == null) {
 						pin.Popup = new PinDebuggerControl();
 						pin.Popup.Mark = pin;
 						Rect rect = new Rect(this.DesiredSize);
 						var point = this.PointToScreen(rect.TopRight);
 						pin.Popup.Location = new Point { X = 500, Y = point.Y - 150 };
 						pin.Nodes.Add(node);
 					}
 					// do actions
 					pin.Popup.Open();
 					BookmarkManager.AddMark(pin);
 				}
 				else
 				{
 					if (!pin.ContainsNode(node))
 						pin.Nodes.Add(node);
 				}
 				pin.Popup.ItemsSource = pin.Nodes;
 			}
 		}
 		void PinButton_Unchecked(object sender, RoutedEventArgs e)
 		{
 			ITextEditorProvider provider = WorkbenchSingleton.Workbench.ActiveViewContent as ITextEditorProvider;
 			var editor = provider.TextEditor;
 			if (editor == null) return;
 			if (!string.IsNullOrEmpty(editor.FileName)) {
 				// remove from pinned DebuggerPopup
 				var pin = BookmarkManager.Bookmarks.Find(
 					b => b is PinBookmark &&
 					b.LineNumber == LogicalPosition.Line &&
 					b.FileName == editor.FileName) as PinBookmark;
 				if (pin == null) return;
 				ToggleButton button = (ToggleButton)e.OriginalSource;
 				pin.RemoveNode((ITreeNode)button.DataContext);
 				pin.Popup.ItemsSource = pin.Nodes;
 				// remove if no more data pins are available
 				if (pin.Nodes.Count == 0) {
 					pin.Popup.Close();
 					BookmarkManager.RemoveMark(pin);
 				}
 			}
 		}
 		#endregion
 		#region Saved Adorner
 		class SavedAdorner : Adorner
 		{
 			public SavedAdorner(UIElement adornedElement) : base(adornedElement)
 			{
 				Loaded += delegate { Show(); };
 			}
 			protected override void OnRender(DrawingContext drawingContext)
 			{
 				Rect adornedElementRect = new Rect(this.AdornedElement.DesiredSize);
 				// Some arbitrary drawing implements.
 				var formatedText = new FormattedText(StringParser.Parse("${res:ICSharpCode.SharpDevelop.Debugging.SavedString}"),
 				                                     CultureInfo.CurrentCulture,
 				                                     FlowDirection.LeftToRight,
 				                                     new Typeface(new FontFamily("Arial"),
 				                                                  FontStyles.Normal,
 				                                                  FontWeights.Black,
 				                                                  FontStretches.Expanded),
 				                                     8d,
 				                                     Brushes.Black);
 				drawingContext.DrawText(formatedText,
 				                        new Point(adornedElementRect.TopRight.X - formatedText.Width - 2,
 				                                  adornedElementRect.TopRight.Y));
 			}
 			private void Show()
 			{
 				DoubleAnimation animation = new DoubleAnimation();
 				animation.From = 1;
 				animation.To = 0;
 				animation.Duration = new Duration(TimeSpan.FromSeconds(2));
 				animation.SetValue(Storyboard.TargetProperty, this);
 				animation.SetValue(Storyboard.TargetPropertyProperty, new PropertyPath(Rectangle.OpacityProperty));
 				Storyboard board = new Storyboard();
 				board.Children.Add(animation);
 				board.Begin(this);
 			}
 		}
 		#endregion
 	}
 }
--- a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/LazyItemsControl.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/LazyItemsControl.cs
@ -1,111 +0,0 @@
 // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 using System;
 using System.Collections.Generic;
 using System.Windows.Controls;
 namespace ICSharpCode.SharpDevelop.Debugging
 {
 	/// <summary>
 	/// ItemsControl wrapper that takes VirtualizingIEnumerable as source,
 	/// and adds additional items from the source to underlying ItemsControl when scrolled to bottom.
 	/// </summary>
 	public class LazyItemsControl<T>
 	{
 		private ItemsControl itemsControl;
 		private int initialItemsCount;
 		/// <summary>
 		/// Creates new instance of LazyItemsControl.
 		/// </summary>
 		/// <param name="wrappedItemsControl">ItemsControl to wrap and add items to it when scrolled to bottom.</param>
 		/// <param name="initialItemsCount">Number of items to be initially displayed in wrapped ItemsControl.</param>
 		public LazyItemsControl(ItemsControl wrappedItemsControl, int initialItemsCount)
 		{
 			if (wrappedItemsControl == null)
 				throw new ArgumentNullException("wrappedItemsControl");
 			this.initialItemsCount = initialItemsCount;
 			this.itemsControl = wrappedItemsControl;
 			this.itemsControl.AddHandler(ScrollViewer.ScrollChangedEvent, new ScrollChangedEventHandler(handleScroll));
 		}
 		private ScrollViewer scrollViewerCached;
 		public ScrollViewer ScrollViewer
 		{
 			get
 			{
 				if (this.scrollViewerCached == null)
 					this.scrollViewerCached = this.itemsControl.GetScrollViewer();
 				return this.scrollViewerCached;
 			}
 		}
 		public bool IsScrolledToStart
 		{
 			get
 			{
 				if (ScrollViewer == null)		// Visual tree not initialized yet
 					return false;
 				return ScrollViewer.VerticalOffset == 0;
 			}
 		}
 		public bool IsScrolledToEnd
 		{
 			get
 			{
 				if (itemsSourceTotalCount == null) {
 					// not scrolled to end of IEnumerable yet
 					return false;
 				}
 				// already scrolled to end of IEnumerable
 				int totalItems = itemsSourceTotalCount.Value;
 				return (ScrollViewer.VerticalOffset >= totalItems - ScrollViewer.ViewportHeight);
 			}
 		}
 		private int? itemsSourceTotalCount = null;
 		/// <summary> Items count of underlying IEnumerable. Null until scrolled to the end of IEnumerable. </summary>
 		public int? ItemsSourceTotalCount
 		{
 			get
 			{
 				return this.itemsSourceTotalCount;
 			}
 		}
 		private VirtualizingIEnumerable<T> itemsSource;
 		/// <summary> The collection that underlying ItemsControl sees. </summary>
 		public VirtualizingIEnumerable<T> ItemsSource
 		{
 			get { return itemsSource; }
 			set
 			{
 				this.itemsSource = value;
 				addNextItems(this.itemsSource, initialItemsCount);
 				this.itemsControl.ItemsSource = value;
 			}
 		}
 		private void addNextItems(VirtualizingIEnumerable<T> sourceToAdd, int nItems)
 		{
 			sourceToAdd.AddNextItems(nItems);
 			if (!sourceToAdd.HasNext) {
 				// all items from IEnumerable have been added
 				this.itemsSourceTotalCount = sourceToAdd.Count;
 			}
 		}
 		private void handleScroll(object sender, ScrollChangedEventArgs e)
 		{
 			if (e.VerticalChange > 0) {
 				// scrolled to bottom
 				if (e.VerticalOffset >= this.itemsSource.Count - e.ViewportHeight) {
 					addNextItems(this.itemsSource, (int)e.VerticalChange);
 				}
 			}
 		}
 	}
 }
--- a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/PinCloseControl.xaml
+++ b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/PinCloseControl.xaml
@ -1,29 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <UserControl
 	Background="Transparent"
 	x:Class="Services.Debugger.Tooltips.PinCloseControl" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 	<UserControl.Resources>
 		<ResourceDictionary>
 			<ResourceDictionary.MergedDictionaries>
 				<ResourceDictionary
 					Source="PinControlsDictionary.xaml" />
 			</ResourceDictionary.MergedDictionaries>
 		</ResourceDictionary>
 	</UserControl.Resources>
 	<StackPanel>
 		<Button
 			Name="CloseButton"
 			Click="CloseButton_Click"
 			Template="{StaticResource CloseButtonTemplate}" />
 		<ToggleButton
 			Name="UnpinButton"
 			Checked="UnpinButton_Checked"
 			Unchecked="UnpinButton_Unchecked"
 			Template="{StaticResource PinButtonTemplate}" />
 		<ToggleButton
 			Name="CommentButton"
 			Checked="CommentButton_Checked"
 			Unchecked="CommentButton_Unchecked"
 			Template="{StaticResource CommentButtonTemplate}" />
 	</StackPanel>
 </UserControl>
--- a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/PinCloseControl.xaml.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/PinCloseControl.xaml.cs
@ -1,77 +0,0 @@
 // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 using System;
 using System.Windows;
 using System.Windows.Controls;
 using ICSharpCode.SharpDevelop.Bookmarks;
 using ICSharpCode.SharpDevelop.Debugging;
 namespace Services.Debugger.Tooltips
 {
 	public class ShowingCommentEventArgs : EventArgs
 	{
 		public bool ShowComment { get; private set; }
 		public ShowingCommentEventArgs(bool showComment)
 		{
 			ShowComment = showComment;
 		}
 	}
 	public partial class PinCloseControl : UserControl
 	{
 		public event EventHandler Closed;
 		public event EventHandler PinningChanged;
 		public event EventHandler<ShowingCommentEventArgs> ShowingComment;
 		public PinCloseControl()
 		{
 			InitializeComponent();
 		}
 		public bool IsChecked {
 			get {
 				return UnpinButton.IsChecked.GetValueOrDefault(false);
 			}
 		}
 		void CloseButton_Click(object sender, RoutedEventArgs e)
 		{
 			var handler = Closed;
 			if (handler != null)
 				handler(this, EventArgs.Empty);
 		}
 		void CommentButton_Checked(object sender, RoutedEventArgs e)
 		{
 			var handler = ShowingComment;
 			if (handler != null)
 				handler(this, new ShowingCommentEventArgs(true));
 		}
 		void CommentButton_Unchecked(object sender, RoutedEventArgs e)
 		{
 			var handler = ShowingComment;
 			if (handler != null)
 				handler(this, new ShowingCommentEventArgs(false));
 		}
 		void UnpinButton_Checked(object sender, RoutedEventArgs e)
 		{
 			var handler = PinningChanged;
 			if (handler != null)
 				handler(this, EventArgs.Empty);
 		}
 		void UnpinButton_Unchecked(object sender, RoutedEventArgs e)
 		{
 			var handler = PinningChanged;
 			if (handler != null)
 				handler(this, EventArgs.Empty);
 		}
 	}
 }
--- a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/PinControlsDictionary.xaml
+++ b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/PinControlsDictionary.xaml
@ -1,337 +0,0 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:local="clr-namespace:Services.Debugger.Tooltips"
 >
 	<LinearGradientBrush x:Key="OrangeBrushKey" EndPoint="0,1" StartPoint="0,0">
 		<LinearGradientBrush.GradientStops>
 			<GradientStop Offset="0" Color="White" />
 			<GradientStop Offset="0.5" Color="Orange" />
 			<GradientStop Offset="1" Color="Orange" />
 		</LinearGradientBrush.GradientStops>
 	</LinearGradientBrush>
 	<LinearGradientBrush x:Key="OrangePressedBrushKey" EndPoint="0,1" StartPoint="0,0">
 		<LinearGradientBrush.GradientStops>
 			<GradientStop Offset="1" Color="White" />
 			<GradientStop Offset="0.5" Color="Orange" />
 			<GradientStop Offset="0" Color="Orange" />
 		</LinearGradientBrush.GradientStops>
 	</LinearGradientBrush>
 	<LinearGradientBrush x:Key="SilverBrushKey" EndPoint="0,1" StartPoint="0,0">
 		<LinearGradientBrush.GradientStops>
 			<GradientStop Offset="0" Color="White" />
 			<GradientStop Offset="0.5" Color="LightGray" />
 			<GradientStop Offset="1" Color="LightGray" />
 		</LinearGradientBrush.GradientStops>
 	</LinearGradientBrush>
 	<LinearGradientBrush x:Key="SilverPressedBrushKey" EndPoint="0,1" StartPoint="0,0">
 		<LinearGradientBrush.GradientStops>
 			<GradientStop Offset="1" Color="White" />
 			<GradientStop Offset="0.5" Color="LightGray" />
 			<GradientStop Offset="0" Color="LightGray" />
 		</LinearGradientBrush.GradientStops>
 	</LinearGradientBrush>
 	<ControlTemplate x:Key="CloseButtonTemplate" TargetType="Button">
 		<Border Width="16" Height="16" Name="TheBorder" CornerRadius="2,2,0,0" BorderThickness="1" BorderBrush="Black" Background="{StaticResource SilverPressedBrushKey}">
 			<Canvas>
 				<Line X1="3.5" X2="10.5" Y1="3.5" Y2="10.5" Stroke="Black" StrokeThickness="2"/>
 				<Line X1="3.5" X2="10.5" Y1="10.5" Y2="3.5" Stroke="Black" StrokeThickness="2"/>
 			</Canvas>
 		</Border>
 		<ControlTemplate.Triggers>
 			<Trigger Property="UIElement.IsMouseOver" Value="true">
 				<Setter TargetName="TheBorder" Property="Background" Value="{StaticResource OrangeBrushKey}"/>
 				<Setter TargetName="TheBorder" Property="BorderBrush" Value="Silver"/>
 			</Trigger>
 			<Trigger Property="ButtonBase.IsPressed" Value="True">
 				<Setter TargetName="TheBorder" Property="Background" Value="{StaticResource OrangePressedBrushKey}"/>
 				<Setter TargetName="TheBorder" Property="BorderBrush" Value="Silver"/>
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<TransformGroup x:Key="Rotate">
 		<RotateTransform Angle="270" CenterX="7" CenterY="7"/>
 	</TransformGroup>
 	<TransformGroup x:Key="RotateUnpin">
 		<RotateTransform Angle="270" CenterX="7" CenterY="7"/>
 		<RotateTransform Angle="-90" CenterX="7" CenterY="7"/>
 		<ScaleTransform ScaleY="-1" CenterX="7" CenterY="7"/>
 	</TransformGroup>
 	<TransformGroup x:Key="RotatePin">
 		<RotateTransform Angle="-90" CenterX="7" CenterY="7"/>
 	</TransformGroup>
 	<TransformGroup x:Key="FlipComment">
 		<ScaleTransform CenterX="7" CenterY="7" ScaleY="-1"/>
 	</TransformGroup>
 	<ControlTemplate x:Key="PinButtonTemplate" TargetType="ToggleButton">
 		<Border Width="16" Height="16" Name="TheBorder" CornerRadius="0" BorderThickness="1" BorderBrush="Black" Background="{StaticResource SilverPressedBrushKey}">
 			<Canvas Name="TheCanvas">
 				<Line X1="4" X2="10" Y1="2" Y2="2" Stroke="Black" StrokeThickness="1"/>
 				<Line X1="9" X2="9" Y1="2" Y2="8" Stroke="Black" StrokeThickness="1"/>
 				<Line X1="2" X2="12" Y1="8" Y2="8" Stroke="Black" StrokeThickness="1"/>
 				<Rectangle Fill="Black" Width="2" Height="5" Canvas.Left="4" Canvas.Top="3"/>
 				<Line X1="7" X2="7" Y1="9" Y2="12" Stroke="Black" StrokeThickness="1"/>
 			</Canvas>
 		</Border>
 		<ControlTemplate.Triggers>
 			<Trigger Property="UIElement.IsMouseOver" Value="true">
 				<Setter TargetName="TheBorder" Property="Background" Value="{StaticResource OrangeBrushKey}"/>
 				<Setter TargetName="TheBorder" Property="BorderBrush" Value="Silver"/>
 			</Trigger>
 			<Trigger Property="ButtonBase.IsPressed" Value="True">
 				<Setter TargetName="TheCanvas" Property="RenderTransform" Value="{StaticResource RotatePin}"/>
 				<Setter TargetName="TheBorder" Property="Background" Value="{StaticResource OrangePressedBrushKey}"/>
 				<Setter TargetName="TheBorder" Property="BorderBrush" Value="Silver"/>
 			</Trigger>
 			<Trigger Property="IsChecked" Value="true">
 				<Setter TargetName="TheCanvas" Property="RenderTransform" Value="{StaticResource RotatePin}"/>
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<ControlTemplate x:Key="CommentButtonTemplate" TargetType="ToggleButton">
 		<Border Width="16" Height="16" Name="TheBorder" CornerRadius="0,0,2,2" BorderThickness="1" BorderBrush="Black" Background="{StaticResource SilverPressedBrushKey}">
 			<Canvas Name="TheCanvas">
 				<Line X1="3" Y1="3" X2="7" Y2="7.5" Stroke="Black" StrokeThickness="1"/>
 				<Line X1="7" Y1="7.4" X2="11" Y2="3" Stroke="Black" StrokeThickness="1"/>
 				<Line X1="3" Y1="7.5" X2="7" Y2="12" Stroke="Black" StrokeThickness="1"/>
 				<Line X1="7" Y1="12" X2="11" Y2="7.5" Stroke="Black" StrokeThickness="1"/>
 			</Canvas>
 		</Border>
 		<ControlTemplate.Triggers>
 			<Trigger Property="UIElement.IsMouseOver" Value="true">
 				<Setter TargetName="TheBorder" Property="Background" Value="{StaticResource OrangeBrushKey}"/>
 				<Setter TargetName="TheBorder" Property="BorderBrush" Value="Silver"/>
 			</Trigger>
 			<Trigger Property="ButtonBase.IsPressed" Value="True">
 				<Setter TargetName="TheBorder" Property="Background" Value="{StaticResource OrangePressedBrushKey}"/>
 				<Setter TargetName="TheBorder" Property="BorderBrush" Value="Silver"/>
 			</Trigger>
 			<Trigger Property="IsChecked" Value="True">
 				<Setter TargetName="TheCanvas" Property="RenderTransform" Value="{StaticResource FlipComment}"/>
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<SolidColorBrush x:Key="MouseOverPinBrush" Color="Black" />
 	<ControlTemplate x:Key="PinTooltipButtonTemplate" TargetType="ToggleButton">
 		<Border Width="16" Height="16" Name="TheBorder" CornerRadius="2" BorderBrush="Transparent" BorderThickness="1" Background="Transparent">
 			<Canvas RenderTransform="{StaticResource Rotate}" Name="TheCanvas">
 				<Line X1="4" X2="10" Y1="2" Y2="2" Stroke="Silver" StrokeThickness="1" Name="Line1"/>
 				<Line X1="9" X2="9" Y1="2" Y2="8" Stroke="Silver" StrokeThickness="1" Name="Line2"/>
 				<Line X1="2" X2="12" Y1="8" Y2="8" Stroke="Silver" StrokeThickness="1" Name="Line3"/>
 				<Rectangle Fill="Silver" Width="2" Height="7" Canvas.Left="4" Canvas.Top="2" Name="Rectangle"/>
 				<Line X1="7" X2="7" Y1="9" Y2="12" Stroke="Silver" StrokeThickness="1" Name="Line4"/>
 			</Canvas>
 		</Border>
 		<ControlTemplate.Triggers>
 			<Trigger Property="ButtonBase.IsPressed" Value="True">
 				<Setter TargetName="TheCanvas" Property="RenderTransform" Value="{StaticResource RotateUnpin}"/>
 			</Trigger>
 			<Trigger Property="ButtonBase.IsMouseOver" Value="True">
 				<Setter TargetName="Line1" Property="Stroke" Value="{StaticResource MouseOverPinBrush}"/>
 				<Setter TargetName="Line2" Property="Stroke" Value="{StaticResource MouseOverPinBrush}"/>
 				<Setter TargetName="Line3" Property="Stroke" Value="{StaticResource MouseOverPinBrush}"/>
 				<Setter TargetName="Line4" Property="Stroke" Value="{StaticResource MouseOverPinBrush}"/>
 				<Setter TargetName="Rectangle" Property="Fill" Value="{StaticResource MouseOverPinBrush}"/>
 			</Trigger>
 			<Trigger Property="IsChecked" Value="True">
 				<Setter TargetName="TheCanvas" Property="RenderTransform" Value="{StaticResource RotateUnpin}"/>
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<Style
 		TargetType="{x:Type TextBox}"
 		x:Key="TextStyle">
 		<Setter
 			Property="OverridesDefaultStyle"
 			Value="True" />
 		<Setter
 			Property="VerticalAlignment"
 			Value="Center" />
 		<Setter
 			Property="FontFamily" Value="Khmer UI" />
 		<Setter Property="FontSize" Value="12" />
 		<Setter
 			Property="KeyboardNavigation.TabNavigation"
 			Value="None" />
 		<Setter
 			Property="FocusVisualStyle"
 			Value="{x:Null}" />
 		<Setter
 			Property="Template">
 			<Setter.Value>
 				<ControlTemplate
 					TargetType="{x:Type TextBoxBase}">
 					<Border
 						Name="Border"
 						Background="Transparent"
 						BorderBrush="Transparent"
 						BorderThickness="0">
 						<ScrollViewer
 							Margin="0"
 							Name="PART_ContentHost" />
 					</Border>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
 	</Style>
 	<Style TargetType="TextBlock" x:Key="TextBlockStyle">
 		<Setter Property="Margin" Value="4 0" />
 		<Setter
 			Property="FontFamily" Value="Khmer UI" />
 		<Setter Property="FontSize" Value="12" />
 	</Style>
 	<Style x:Key="PinThumbStyle" TargetType="Thumb">
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="Thumb">
 					<StackPanel x:Name="Container"/>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
 	</Style>
 	<Style
 		x:Key="ExpandCollapseToggleStyle"
 		TargetType="{x:Type ToggleButton}">
 		<Setter
 			Property="Focusable"
 			Value="False" />
 		<Setter
 			Property="Width"
 			Value="19" />
 		<Setter
 			Property="Height"
 			Value="13" />
 		<Setter
 			Property="Template">
 			<Setter.Value>
 				<ControlTemplate
 					TargetType="{x:Type ToggleButton}">
 					<Border
 						Width="19"
 						Height="13"
 						Background="Transparent">
 						<Border
 							Width="9"
 							Height="9"
 							BorderThickness="1"
 							BorderBrush="#FF7898B5"
 							CornerRadius="1"
 							SnapsToDevicePixels="true">
 							<Border.Background>
 								<LinearGradientBrush
 									StartPoint="0,0"
 									EndPoint="1,1">
 									<LinearGradientBrush.GradientStops>
 										<GradientStop
 											Color="White"
 											Offset=".2" />
 										<GradientStop
 											Color="#FFC0B7A6"
 											Offset="1" />
 									</LinearGradientBrush.GradientStops>
 								</LinearGradientBrush>
 							</Border.Background>
 							<Path
 								x:Name="ExpandPath"
 								Margin="1,1,1,1"
 								Fill="Black"
 								Data="M 0 2 L 0 3 L 2 3 L 2 5 L 3 5 L 3 3 L 5 3 L 5 2 L 3 2 L 3 0 L 2 0 L 2 2 Z" />
 						</Border>
 					</Border>
 					<ControlTemplate.Triggers>
 						<Trigger
 							Property="IsChecked"
 							Value="True">
 							<Setter
 								Property="Data"
 								TargetName="ExpandPath"
 								Value="M 0 2 L 0 3 L 5 3 L 5 2 Z" />
 						</Trigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
 	</Style>
 	<Style
 		x:Key="upDownBorderStyle"
 		TargetType="{x:Type Border}">
 		<Setter
 			Property="BorderBrush"
 			Value="Gray" />
 		<Setter
 			Property="HorizontalAlignment"
 			Value="Stretch" />
 		<Setter
 			Property="Margin"
 			Value="0" />
 		<Setter
 			Property="Padding"
 			Value="0" />
 		<Setter
 			Property="Background"
 			Value="#FFECF7FC" />
 		<Setter
 			Property="Height"
 			Value="14" />
 		<Style.Triggers>
 			<DataTrigger
 				Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEnabled}"
 				Value="False">
 				<Setter
 					Property="Background"
 					Value="#FFE0E0E0"></Setter>
 			</DataTrigger>
 		</Style.Triggers>
 	</Style>
 	<Style
 		x:Key="upButtonStyle"
 		TargetType="{x:Type RepeatButton}">
 		<Setter
 			Property="Template">
 			<Setter.Value>
 				<ControlTemplate
 					TargetType="{x:Type RepeatButton}">
 					<Border
 						Style="{StaticResource upDownBorderStyle}"
 						BorderThickness="1 1 1 0">
 						<ContentPresenter
 							HorizontalAlignment="Center"></ContentPresenter>
 					</Border>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
 	</Style>
 	<Style
 		x:Key="downButtonStyle"
 		TargetType="{x:Type RepeatButton}">
 		<Setter
 			Property="Template">
 			<Setter.Value>
 				<ControlTemplate
 					TargetType="{x:Type RepeatButton}">
 					<Border
 						Style="{StaticResource upDownBorderStyle}"
 						BorderThickness="1 0 1 1">
 						<ContentPresenter
 							HorizontalAlignment="Center"></ContentPresenter>
 					</Border>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
 	</Style>
 </ResourceDictionary>
--- a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/PinDebuggerControl.xaml
+++ b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/PinDebuggerControl.xaml
@ -1,258 +0,0 @@
 <UserControl x:Class="Services.Debugger.Tooltips.PinDebuggerControl"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:local="clr-namespace:Services.Debugger.Tooltips"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:core="http://icsharpcode.net/sharpdevelop/core"
 >
 	<UserControl.Resources>
 		<ResourceDictionary>
 			<ResourceDictionary.MergedDictionaries>
 				<ResourceDictionary
 					Source="PinControlsDictionary.xaml" />
 			</ResourceDictionary.MergedDictionaries>
 		</ResourceDictionary>
 	</UserControl.Resources>
 	<Grid>
 		<Grid.Resources>
 			<LinearGradientBrush x:Key="DataGridBackground"
 				StartPoint="0,-0.03"
 				EndPoint="0,1">
 				<GradientStop
 					Color="White" />
 				<GradientStop
 					Color="#FFFAFCFE"
 					Offset="0.983" />
 				<GradientStop
 					Color="#FFECF7FC"
 					Offset="0.07" />
 				<GradientStop
 					Color="#FFEEF7FA"
 					Offset="0.436" />
 			</LinearGradientBrush>
 			<Style x:Key="CellStyle"
 			       TargetType="{x:Type DataGridCell}">
 				<Setter
 					Property="Focusable"
 					Value="false" />
 				<!-- Focusable=true blocks shortcuts if cell is focused -->
 				<Setter
 					Property="BorderThickness"
 					Value="0" />
 				<Setter Property="Width" Value="Auto" />
 				<Style.Triggers>
 					<Trigger
 						Property="IsSelected"
 						Value="True">
 						<!-- disable selection highlight -->
 						<Setter
 							Property="Foreground"
 							Value="Black" />
 						<Setter
 							Property="Background"
 							Value="{x:Null}" />
 					</Trigger>
 				</Style.Triggers>
 			</Style>
 			<Style x:Key="RowStyle"
 			       TargetType="{x:Type DataGridRow}">
 				<Setter
 					Property="Background"
 					Value="Transparent"></Setter>
 			</Style>
 			<Style x:Key="DataGridStyle" TargetType="DataGrid">
 				<Setter Property="VerticalScrollBarVisibility" Value="Disabled"/>
 				<Setter Property="HorizontalScrollBarVisibility" Value="Disabled"/>
 				<Setter Property="GridLinesVisibility" Value="None"/>
 				<Setter Property="RowHeight" Value="18"/>
 				<Setter Property="MaxHeight" Value="202"/>
 				<Setter Property="MinHeight" Value="20" />
 				<Setter Property="SelectionMode" Value="Single"/>
 				<Setter Property="SelectionUnit" Value="FullRow"/>
 				<Setter Property="AutoGenerateColumns" Value="False"/>
 				<Setter Property="CanUserAddRows" Value="False"/>
 				<Setter Property="HeadersVisibility" Value="None"/>
 				<Setter Property="BorderBrush" Value="Gray"/>
 				<Setter Property="Background" Value="{StaticResource DataGridBackground}"/>
 				<Setter Property="CellStyle" Value="{StaticResource CellStyle}"/>
 				<Setter Property="RowStyle" Value="{StaticResource RowStyle}"/>
 				<Style.Triggers>
 					<Trigger Property="IsMouseOver" Value="True">
 						<Setter Property="Cursor" Value="Arrow"/>
 					</Trigger>
 				</Style.Triggers>
 			</Style>
 		</Grid.Resources>
 		<Grid.ColumnDefinitions>
 			<ColumnDefinition Width="Auto"/>
 			<ColumnDefinition Width="Auto"/>
 		</Grid.ColumnDefinitions>
 		<StackPanel VerticalAlignment="Center">
 			<Grid>
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition Width="Auto"/>
 					<ColumnDefinition Width="Auto"/>
 					<ColumnDefinition Width="Auto"/>
 				</Grid.ColumnDefinitions>
 				<DataGrid
 					Width="21"
 					BorderThickness="1,1,0,1"
 					Background="White"
 					x:Name="ExpandersGrid"
 					Style="{StaticResource DataGridStyle}"
 					ItemsSource="{Binding}">
 					<DataGrid.Columns>
 						<DataGridTemplateColumn>
 							<DataGridTemplateColumn.CellTemplate>
 								<DataTemplate>
 									<Grid
 										Background="White">
 										<StackPanel
 											VerticalAlignment="Center">
 											<ToggleButton
 												x:Name="btnExpander"
 												Style="{StaticResource ExpandCollapseToggleStyle}"
 												Checked="BtnExpander_Checked"
 												Unchecked="BtnExpander_Unchecked"
 												Padding="0"
 												Margin="0" />
 										</StackPanel>
 									</Grid>
 									<DataTemplate.Triggers>
 										<DataTrigger
 											Binding="{Binding Path=HasChildNodes}"
 											Value="False">
 											<Setter
 												TargetName="btnExpander"
 												Property="Visibility"
 												Value="Collapsed" />
 										</DataTrigger>
 									</DataTemplate.Triggers>
 								</DataTemplate>
 							</DataGridTemplateColumn.CellTemplate>
 						</DataGridTemplateColumn>
 					</DataGrid.Columns>
 				</DataGrid>
 				<DataGrid
 					BorderThickness="0,1,0,1"
 					Grid.Column="1"
 					IsEnabled="False"
 					ColumnWidth="SizeToCells"
 					Style="{StaticResource DataGridStyle}"
 					ItemsSource="{Binding}"
 					Foreground="Black"
 					Name="dataGrid">
 					<DataGrid.Columns>
 						<DataGridTemplateColumn>
 							<DataGridTemplateColumn.CellTemplate>
 								<DataTemplate>
 									<Image
 										Source="{Binding ImageSource}"></Image>
 								</DataTemplate>
 							</DataGridTemplateColumn.CellTemplate>
 						</DataGridTemplateColumn>
 						<DataGridTemplateColumn
 							MinWidth="20"
 							Header="Name">
 							<!-- Name -->
 							<DataGridTemplateColumn.CellTemplate>
 								<DataTemplate>
 									<Border
 										BorderBrush="#FFDDDDDD"
 										BorderThickness="0 0 1 0">
 										<TextBlock
 											Style="{StaticResource TextBlockStyle}"
 											Text="{Binding Path=FullName, Mode=OneWay}"
 											VerticalAlignment="Center"></TextBlock>
 									</Border>
 								</DataTemplate>
 							</DataGridTemplateColumn.CellTemplate>
 						</DataGridTemplateColumn>
 						<DataGridTemplateColumn IsReadOnly="True"
 							Width="SizeToCells"
 							Header="Text">
 							<!-- Text (value) -->
 							<DataGridTemplateColumn.CellTemplate>
 								<DataTemplate>
 									<TextBox
 										Style="{StaticResource TextStyle}"
 										IsEnabled="false"
 										Text="{Binding Path=Text}" />
 								</DataTemplate>
 							</DataGridTemplateColumn.CellTemplate>
 						</DataGridTemplateColumn>
 					</DataGrid.Columns>
 				</DataGrid>
 				<DataGrid
 					MaxWidth="20"
 					BorderThickness="1"
 					Grid.Column="2"
 					x:Name="ImagesGrid"
 					Style="{StaticResource DataGridStyle}"
 					ItemsSource="{Binding}">
 					<DataGrid.Columns>
 						<DataGridTemplateColumn>
 							<DataGridTemplateColumn.CellTemplate>
 								<DataTemplate>
 									<Border
 										Name="ImageBorder"
 										CornerRadius="7"
 										BorderBrush="Transparent"
 										BorderThickness="1"
 										Height="14"
 										Width="14">
 										<Image Width="9" Height="9" Margin="2 2"
 										       x:Name="RefreshContentImage"
 										       MouseDown="RefreshContentImage_MouseDown"
 										       Tag="{Binding}"
 										       Source="{core:GetBitmap Icons.16x16.Refresh}"/>
 									</Border>
 									<DataTemplate.Triggers>
 										<Trigger Property="IsMouseOver" Value="true">
 											<Setter
 												TargetName="ImageBorder"
 												Property="BorderBrush"
 												Value="Gray" />
 										</Trigger>
 									</DataTemplate.Triggers>
 								</DataTemplate>
 							</DataGridTemplateColumn.CellTemplate>
 						</DataGridTemplateColumn>
 					</DataGrid.Columns>
 				</DataGrid>
 			</Grid>
 			<!--	comment textbox	-->
 			<Border
 				Name="BorderComment"
 				Background="White"
 				BorderThickness="1,0,1,1"
 				BorderBrush="Gray"
 				Height="0"
 				MaxHeight="50">
 				<TextBox
 					Name="CommentTextBox"
 					TextChanged="CommentTextBox_TextChanged"
 					Margin="3"/>
 			</Border>
 		</StackPanel>
 		<local:PinCloseControl
 			VerticalAlignment="Center"
 			Background="Transparent"
 			Grid.Column="1"
 			Margin="5,0,0,0"
 			x:Name="PinCloseControl">
 			<local:PinCloseControl.Effect>
 				<DropShadowEffect
 					ShadowDepth="5"
 					Direction="330"
 					Color="Black"
 					Opacity="0.5"/>
 			</local:PinCloseControl.Effect>
 		</local:PinCloseControl>
 	</Grid>
 </UserControl>
--- a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/PinDebuggerControl.xaml.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/PinDebuggerControl.xaml.cs
@ -1,338 +0,0 @@
 // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 using System;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using System.Windows.Media.Animation;
 using System.Windows.Shapes;
 using Debugger;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Bookmarks;
 using ICSharpCode.SharpDevelop.Debugging;
 using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.SharpDevelop.Gui;
 namespace Services.Debugger.Tooltips
 {
 	public partial class PinDebuggerControl : UserControl, IPinDebuggerControl
 	{
 		private const double ChildPopupOpenXOffet = 16;
 		private const double ChildPopupOpenYOffet = 15;
 		private const int InitialItemsCount = 12;
 		private const double MINIMUM_OPACITY = 0.3;
 		private DebuggerPopup childPopup;
 		private LazyItemsControl<ITreeNode> lazyExpandersGrid;
 		private LazyItemsControl<ITreeNode> lazyGrid;
 		private LazyItemsControl<ITreeNode> lazyImagesGrid;
 		private IEnumerable<ITreeNode> itemsSource;
 		public PinDebuggerControl()
 		{
 			InitializeComponent();
 			if (!DebuggerService.IsDebuggerRunning)
 				Opacity = MINIMUM_OPACITY;
 			PinCloseControl.Opacity = 0;
 			Loaded += OnLoaded;
 			this.PinCloseControl.Closed += PinCloseControl_Closed;
 			this.PinCloseControl.ShowingComment += PinCloseControl_ShowingComment;
 			this.PinCloseControl.PinningChanged += PinCloseControl_PinningChanged;
 			BookmarkManager.Removed += BookmarkManager_Removed;
 			if (DebuggerService.DebuggedProcess != null)
 				DebuggerService.DebuggedProcess.Paused += DebuggerService_CurrentDebugger_DebuggedProcess_Paused;
 			DebuggerService.ProcessSelected += delegate {
 				Opacity = 1.0;
 				DebuggerService.DebuggedProcess.Paused += DebuggerService_CurrentDebugger_DebuggedProcess_Paused;
 			};
 		}
 		#region Properties
 		public PinBookmark Mark { get; set; }
 		public IEnumerable<ITreeNode> ItemsSource {
 			set {
 				itemsSource = value;
 				var items = new VirtualizingIEnumerable<ITreeNode>(value);
 				lazyExpandersGrid = new LazyItemsControl<ITreeNode>(this.ExpandersGrid, InitialItemsCount);
 				lazyExpandersGrid.ItemsSource = items;
 				lazyGrid = new LazyItemsControl<ITreeNode>(this.dataGrid, InitialItemsCount);
 				lazyGrid.ItemsSource = items;
 				lazyImagesGrid = new LazyItemsControl<ITreeNode>(this.ImagesGrid, InitialItemsCount);
 				lazyImagesGrid.ItemsSource = items;
 			}
 		}
 		/// <summary>
 		/// Relative position of the pin with respect to the screen.
 		/// </summary>
 		public Point Location { get; set; }
 		#endregion
 		#region Main operations
 		public void Open()
 		{
 			Pin();
 		}
 		public void Close()
 		{
 			Unpin();
 		}
 		void Pin()
 		{
 			var provider = WorkbenchSingleton.Workbench.ActiveContent as ITextEditorProvider;
 			if (provider != null) {
 				PinningBinding.GetPinlayer(provider.TextEditor).Pin(this);
 			}
 		}
 		void Unpin()
 		{
 			var provider = WorkbenchSingleton.Workbench.ActiveContent as ITextEditorProvider;
 			if (provider != null) {
 				PinningBinding.GetPinlayer(provider.TextEditor).Unpin(this);
 			}
 		}
 		#endregion
 		#region Expand buton
 		private ToggleButton expandedButton;
 		/// <summary>
 		/// Closes the child popup of this control, if it exists.
 		/// </summary>
 		void CloseChildPopups()
 		{
 			if (this.expandedButton != null) {
 				this.expandedButton = null;
 				// nice simple example of indirect recursion
 				this.childPopup.CloseSelfAndChildren();
 			}
 		}
 		void BtnExpander_Checked(object sender, RoutedEventArgs e)
 		{
 			var clickedButton = (ToggleButton)e.OriginalSource;
 			var clickedNode = (ITreeNode)clickedButton.DataContext;
 			// use device independent units, because child popup Left/Top are in independent units
 			Point buttonPos = clickedButton.PointToScreen(new Point(0, 0)).TransformFromDevice(clickedButton);
 			if (clickedButton.IsChecked.GetValueOrDefault(false)) {
 				this.expandedButton = clickedButton;
 				// open child Popup
 				if (this.childPopup == null) {
 					this.childPopup = new DebuggerPopup(null, false);
 					this.childPopup.PlacementTarget = this;
 					this.childPopup.Closed += new EventHandler(PinDebuggerControl_Closed);
 					this.childPopup.Placement = PlacementMode.Absolute;
 				}
 				this.childPopup.IsLeaf = true;
 				this.childPopup.HorizontalOffset = buttonPos.X + ChildPopupOpenXOffet;
 				this.childPopup.VerticalOffset = buttonPos.Y + ChildPopupOpenYOffet;
 				this.childPopup.ItemsSource = clickedNode.ChildNodes;
 				this.childPopup.Open();
 			} else {
 			}
 		}
 		void PinDebuggerControl_Closed(object sender, EventArgs e)
 		{
 			if (expandedButton != null && expandedButton.IsChecked.GetValueOrDefault(false))
 				expandedButton.IsChecked = false;
 		}
 		void BtnExpander_Unchecked(object sender, RoutedEventArgs e)
 		{
 			CloseChildPopups();
 		}
 		#endregion
 		#region PinCloseControl
 		void PinCloseControl_Closed(object sender, EventArgs e)
 		{
 			BookmarkManager.RemoveMark(Mark);
 			CloseChildPopups();
 			Unpin();
 		}
 		void PinCloseControl_PinningChanged(object sender, EventArgs e)
 		{
 			if (this.PinCloseControl.IsChecked) {
 				BookmarkManager.RemoveMark(Mark);
 			} else {
 				if (BookmarkManager.Bookmarks.Contains(Mark))
 					BookmarkManager.RemoveMark(Mark);
 				BookmarkManager.AddMark(Mark);
 			}
 		}
 		void PinCloseControl_ShowingComment(object sender, ShowingCommentEventArgs e)
 		{
 			ShowComment(e.ShowComment);
 		}
 		void AnimateCloseControl(bool show)
 		{
 			DoubleAnimation animation = new DoubleAnimation();
 			animation.From = show ? 0 : 1;
 			animation.To = show ? 1 : 0;
 			animation.BeginTime = new TimeSpan(0, 0, show ? 0 : 1);
 			animation.Duration = new Duration(TimeSpan.FromMilliseconds(500));
 			animation.SetValue(Storyboard.TargetProperty, this.PinCloseControl);
 			animation.SetValue(Storyboard.TargetPropertyProperty, new PropertyPath(Rectangle.OpacityProperty));
 			Storyboard board = new Storyboard();
 			board.Children.Add(animation);
 			board.Begin(this);
 		}
 		#endregion
 		void BookmarkManager_Removed(object sender, BookmarkEventArgs e)
 		{
 			// if the bookmark was removed from pressing the button, return
 			if (this.PinCloseControl.IsChecked)
 				return;
 			if (e.Bookmark is PinBookmark) {
 				var pin = (PinBookmark)e.Bookmark;
 				if (pin.Location == Mark.Location && pin.FileName == Mark.FileName) {
 					Close();
 				}
 			}
 		}
 		void OnLoaded(object sender, RoutedEventArgs e)
 		{
 			this.CommentTextBox.Text = Mark.Comment;
 		}
 		#region Comment
 		void ShowComment(bool show)
 		{
 			if (show && BorderComment.Height != 0)
 				return;
 			if (!show && BorderComment.Height != 40)
 				return;
 			DoubleAnimation animation = new DoubleAnimation();
 			animation.From = show ? 0 : 40;
 			animation.To = show ? 40 : 0;
 			animation.Duration = new Duration(TimeSpan.FromMilliseconds(300));
 			animation.SetValue(Storyboard.TargetProperty, BorderComment);
 			animation.SetValue(Storyboard.TargetPropertyProperty, new PropertyPath(Border.HeightProperty));
 			Storyboard board = new Storyboard();
 			board.Children.Add(animation);
 			board.Begin(this);
 		}
 		void CommentTextBox_TextChanged(object sender, TextChangedEventArgs e)
 		{
 			Mark.Comment = this.CommentTextBox.Text;
 		}
 		#endregion
 		void DebuggerService_CurrentDebugger_DebuggedProcess_Paused(object sender, ProcessEventArgs e)
 		{
 			var observable = new List<ITreeNode>();
 			foreach (var node in lazyGrid.ItemsSource) {
 				var resultNode = DebuggerService.CurrentDebugger.GetNode(node.FullName);
 				// HACK for updating the pins in tooltip
 				observable.Add(resultNode);
 			}
 			// update UI
 			var newSource = new VirtualizingIEnumerable<ITreeNode>(observable);
 			lazyGrid.ItemsSource = newSource;
 			lazyExpandersGrid.ItemsSource = newSource;
 		}
 		void RefreshContentImage_MouseDown(object sender, MouseButtonEventArgs e)
 		{
 			// refresh content
 			ITreeNode node = ((Image)sender).DataContext as ITreeNode;
 			if (!DebuggerService.IsDebuggerRunning)
 				return;
 			var resultNode = DebuggerService.CurrentDebugger.GetNode(node.FullName);
 			// HACK for updating the pins in tooltip
 			var observable = new List<ITreeNode>();
 			var source = lazyGrid.ItemsSource;
 			source.ForEach(item =>
 			{
 				if (item.CompareTo(node) == 0)
 					observable.Add(resultNode);
 				else
 					observable.Add(item);
 			});
 			// update UI
 			var newSource = new VirtualizingIEnumerable<ITreeNode>(observable);
 			lazyGrid.ItemsSource = newSource;
 			lazyExpandersGrid.ItemsSource = newSource;
 		}
 		#region Overrides
 		protected override void OnMouseEnter(System.Windows.Input.MouseEventArgs e)
 		{
 			AnimateCloseControl(true);
 			Opacity = 1.0;
 			Cursor = Cursors.Arrow;
 			base.OnMouseEnter(e);
 		}
 		protected override void OnMouseMove(MouseEventArgs e)
 		{
 			Opacity = 1.0;
 			Cursor = Cursors.Arrow;
 			base.OnMouseMove(e);
 		}
 		protected override void OnMouseLeave(System.Windows.Input.MouseEventArgs e)
 		{
 			if (DebuggerService.IsDebuggerRunning)
 				Opacity = 1;
 			else
 				Opacity = MINIMUM_OPACITY;
 			AnimateCloseControl(false);
 			Cursor = Cursors.IBeam;
 			base.OnMouseLeave(e);
 		}
 		#endregion
 	}
 }
--- a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/PinningBinding.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/PinningBinding.cs
@ -1,121 +0,0 @@
 // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 using System;
 using System.Collections.ObjectModel;
 using System.Windows;
 using Editor.AvalonEdit;
 using ICSharpCode.AvalonEdit;
 using ICSharpCode.AvalonEdit.Rendering;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Bookmarks;
 using ICSharpCode.SharpDevelop.Debugging;
 using ICSharpCode.SharpDevelop.Editor;
 namespace Services.Debugger.Tooltips
 {
 	public class PinningBinding : DefaultLanguageBinding
 	{
 		ITextEditor _editor;
 		public PinningBinding()
 		{}
 		public override void Attach(ITextEditor editor)
 		{
 			if (editor == null)
 				return;
 			var textEditor = editor.GetService(typeof(TextEditor)) as TextEditor;
 			if (textEditor != null) {
 				textEditor.TextArea.TextView.InsertLayer(
 					new PinLayer(textEditor.TextArea),
 					KnownLayer.Caret,
 					LayerInsertionPosition.Above);
 			}
 			_editor = editor;
 			CreatePins(_editor);
 			base.Attach(editor);
 		}
 		public override void Detach()
 		{
 			ClosePins(_editor);
 			base.Detach();
 		}
 		public static void CreatePins(ITextEditor editor)
 		{
 			// load pins
 			var pins = BookmarkManager.Bookmarks.FindAll(
 				b => b is PinBookmark && b.FileName == editor.FileName);
 			foreach (var bookmark in pins) {
 				var pin = (PinBookmark)bookmark;
 				pin.Popup = new PinDebuggerControl();
 				pin.Popup.Mark = pin;
 				var nodes = new ObservableCollection<ITreeNode>();
 				foreach (var tuple in pin.SavedNodes) {
 					var node = new TreeNode();
 					node.IconImage =
 						new ResourceServiceImage(
 							!string.IsNullOrEmpty(tuple.Item1) ? tuple.Item1 : "Icons.16x16.Field");
 					node.FullName = tuple.Item2;
 					node.Text = tuple.Item3;
 					nodes.Add(node);
 				}
 				pin.SavedNodes.Clear();
 				pin.Popup.ItemsSource = nodes;
 				pin.Nodes = nodes;
 				pin.Popup.Open();
 				GetPinlayer(editor).Pin(pin.Popup);
 			}
 		}
 		public static void ClosePins(ITextEditor editor)
 		{
 			// save pins
 			var pins = BookmarkManager.Bookmarks.FindAll(
 				b => b is PinBookmark && b.FileName == editor.FileName);
 			foreach (var bookmark in pins) {
 				var pin = (PinBookmark)bookmark;
 				if (!pin.PinPosition.HasValue)
 					pin.PinPosition = pin.Popup.Location;
 				// nodes
 				if (pin.SavedNodes == null)
 					pin.SavedNodes = new System.Collections.Generic.List<Tuple<string, string, string>>();
 				foreach (var node in pin.Nodes) {
 					pin.SavedNodes.Add(
 						new Tuple<string, string, string>(
 							"Icons.16x16.Field",
 							node.FullName,
 							node.Text));
 				}
 				GetPinlayer(editor).Unpin(pin.Popup);
 				pin.Popup = null;
 			}
 		}
 		public static PinLayer GetPinlayer(ITextEditor editor) {
 			var textEditor = editor.GetService(typeof(TextEditor)) as TextEditor;
 			if (textEditor != null) {
 				foreach(var layer in textEditor.TextArea.TextView.Layers)
 					if(((Layer)layer).LayerType == KnownLayer.DataPins)
 						return (PinLayer)layer;
 			}
 			return null;
 		}
 	}
 }
--- a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/VirtualizingIEnumerable.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/VirtualizingIEnumerable.cs
@ -1,53 +0,0 @@
 // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 namespace ICSharpCode.SharpDevelop.Debugging
 {
 	/// <summary>
 	/// A wrapper around IEnumerable&lt;T&gt; with AddNextItems method for pulling additional items 
 	/// from underlying IEnumerable&lt;T&gt;.
 	/// Can be used as source for <see cref="LazyItemsControl" />.
 	/// </summary>
 	public class VirtualizingIEnumerable<T> : ObservableCollection<T>
 	{
 		private IEnumerator<T> originalSourceEnumerator;
 		public VirtualizingIEnumerable(IEnumerable<T> originalSource)
 		{
 			if (originalSource == null)
 				throw new ArgumentNullException("originalSource");
 			this.originalSourceEnumerator = originalSource.GetEnumerator();
 		}
 		private bool hasNext = true;
 		/// <summary>
 		/// False if all items from underlying IEnumerable have already been added.
 		/// </summary>
 		public bool HasNext
 		{
 			get
 			{
 				return this.hasNext;
 			}
 		}
 		/// <summary>
 		/// Requests next <paramref name="count"/> items from underlying IEnumerable source and adds them to the collection.
 		/// </summary>
 		public void AddNextItems(int count)
 		{
 			for (int i = 0; i < count; i++) {
 				if (!originalSourceEnumerator.MoveNext()) {
 					this.hasNext = false;
 					break;
 				}
 				this.Add(originalSourceEnumerator.Current);
 			}
 		}
 	}
 }
--- a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/VisualizerPicker.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/VisualizerPicker.cs
@ -1,46 +0,0 @@
 // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 using ICSharpCode.Core;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Controls;
 namespace ICSharpCode.SharpDevelop.Debugging
 {
 	/// <summary>
 	/// Control displaying and executing <see cref="IVisualizerCommand">visualizer commands</see>.
 	/// </summary>
 	public class VisualizerPicker : ComboBox
 	{
 		public VisualizerPicker()
 		{
 			this.SelectionChanged += VisualizerPicker_SelectionChanged;
 		}
 		void VisualizerPicker_SelectionChanged(object sender, SelectionChangedEventArgs e)
 		{
 			if (this.SelectedItem == null) {
 				return;
 			}
 			var clickedCommand = this.SelectedItem as IVisualizerCommand;
 			if (clickedCommand == null) {
 				throw new InvalidOperationException(
 					string.Format("{0} clicked, only instances of {1} must be present in {2}.",
 								  this.SelectedItem.GetType().ToString(), typeof(IVisualizerCommand).Name, typeof(VisualizerPicker).Name));
 			}
 			clickedCommand.Execute();
 			// Make no item selected, so that multiple selections of the same item always execute the command.
 			// This triggers VisualizerPicker_SelectionChanged again, which returns immediately.
 			this.SelectedIndex = -1;
 		}
 		public new IEnumerable<IVisualizerCommand> ItemsSource
 		{
 			get { return (IEnumerable<IVisualizerCommand>)base.ItemsSource; }
 			set { base.ItemsSource = value; }
 		}
 	}
 }
--- a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/VisualizerPicker.xaml
+++ b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/VisualizerPicker.xaml
@ -1,135 +0,0 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
    xmlns:debugging="clr-namespace:ICSharpCode.SharpDevelop.Debugging">
 	<BitmapImage x:Key="MagnifierImage" UriSource="magnifier.png" />
        <Style x:Key="ComboBoxFocusVisual">
            <Setter Property="Control.Template">
                <Setter.Value>
                    <ControlTemplate>
                        <Rectangle Stroke="Black" StrokeDashArray="1 2" StrokeThickness="1" Margin="4,4,21,4" SnapsToDevicePixels="true"/>
                    </ControlTemplate>
                </Setter.Value>
            </Setter>
        </Style>
        <LinearGradientBrush x:Key="ButtonNormalBackground" EndPoint="0,1" StartPoint="0,0">
            <GradientStop Color="#F3F3F3" Offset="0"/>
            <GradientStop Color="#EBEBEB" Offset="0.5"/>
            <GradientStop Color="#DDDDDD" Offset="0.5"/>
            <GradientStop Color="#CDCDCD" Offset="1"/>
        </LinearGradientBrush>
        <SolidColorBrush x:Key="ButtonNormalBorder" Color="#FF707070"/>
        <Geometry x:Key="DownArrowGeometry">M 0 0 L 2 3 L 4 0 Z</Geometry>
        <Style x:Key="ComboBoxReadonlyToggleButton" TargetType="{x:Type ToggleButton}">
 		<Setter Property="OverridesDefaultStyle" Value="true"/>
 		<Setter Property="IsTabStop" Value="false"/>
 		<Setter Property="Focusable" Value="false"/>
 		<Setter Property="ClickMode" Value="Press"/>
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type ToggleButton}">
 					<!-- Button face - changed from original ButtonChrome to Border -->
 					<Border Name="FaceBorder" Background="Transparent" CornerRadius="2" BorderBrush="Transparent" BorderThickness="1" Padding="1" >
 						<Grid>
 							<Grid.ColumnDefinitions>
 								<ColumnDefinition Width="*"/>
 								<ColumnDefinition  Width="5"/>
 							</Grid.ColumnDefinitions>
 							<!--  
 							<Rectangle Width="10" Height="10" Grid.Column="0" Fill="Black"></Rectangle> -->
 							<Image Grid.Column="0" Width="10" Height="10" Stretch="Fill" Source="{StaticResource MagnifierImage}" />
 							<Path Grid.Column="1" x:Name="Arrow" Fill="Black" HorizontalAlignment="Center" Margin="0" VerticalAlignment="Center" Data="{StaticResource DownArrowGeometry}"/>
 						</Grid>
 					</Border>
 					<ControlTemplate.Triggers>
 						<Trigger Property="IsChecked" Value="true">
 							<Setter TargetName="FaceBorder" Property="Background" Value="White"/>
 							<Setter TargetName="FaceBorder" Property="BorderBrush" Value="#FFE0EDFF"/>
 						</Trigger>
 						<Trigger Property="IsMouseOver" Value="true">
 							<Setter TargetName="FaceBorder" Property="Background" Value="White"/>
 							<Setter TargetName="FaceBorder" Property="BorderBrush" Value="#FFE0EDFF"/>
 					    <!-- #FFE0EDFF border -->
 						<!--   #FFD9D9E9 fill  -->
 						</Trigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
 	</Style>
 	<LinearGradientBrush x:Key="TextBoxBorder" EndPoint="0,20" StartPoint="0,0" MappingMode="Absolute">
 		<GradientStop Color="#ABADB3" Offset="0.05"/>
 		<GradientStop Color="#E2E3EA" Offset="0.07"/>
 		<GradientStop Color="#E3E9EF" Offset="1"/>
 	</LinearGradientBrush>
 	<Style TargetType="{x:Type debugging:VisualizerPicker}">
 		<Setter Property="FocusVisualStyle" Value="{StaticResource ComboBoxFocusVisual}"/>
 		<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
 		<Setter Property="Background" Value="{StaticResource ButtonNormalBackground}"/>
 		<Setter Property="BorderBrush" Value="{StaticResource ButtonNormalBorder}"/>
 		<Setter Property="BorderThickness" Value="1"/>
 		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
 		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
 		<Setter Property="Padding" Value="4,3"/>
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type debugging:VisualizerPicker}">
 					<!--  ComboBox face -->
 					<Grid x:Name="MainGrid" SnapsToDevicePixels="true" Width="18" Height="16">
 						<Grid.ColumnDefinitions>
 							<ColumnDefinition Width="*"/>
 							<ColumnDefinition  Width="5"/>
 						</Grid.ColumnDefinitions>
 						<Popup x:Name="PART_Popup" Margin="1" AllowsTransparency="true" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" Placement="Bottom" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Grid.ColumnSpan="2">
 							<Microsoft_Windows_Themes:SystemDropShadowChrome x:Name="Shdw" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=MainGrid}" Color="Transparent">
 								<Border x:Name="DropDownBorder" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1">
 									<ScrollViewer CanContentScroll="true">
 										<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.DirectionalNavigation="Contained"/>
 									</ScrollViewer>
 								</Border>
 							</Microsoft_Windows_Themes:SystemDropShadowChrome>
 						</Popup>
 						<ToggleButton Style="{StaticResource ComboBoxReadonlyToggleButton}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"/>
 						<!-- Content of ComboBox face -->
 						<ContentPresenter 
                                HorizontalAlignment="Left" 
                                Margin="0" 
                                VerticalAlignment="Center" 
                                IsHitTestVisible="false" 
                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
                                ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" 
                                Content=" " 
                                ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" 
                                ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"/>
 					</Grid>
 					<ControlTemplate.Triggers>
 						<Trigger Property="HasDropShadow" SourceName="PART_Popup" Value="true">
 							<Setter Property="Margin" TargetName="Shdw" Value="0,0,5,5"/>
 							<Setter Property="Color" TargetName="Shdw" Value="#71000000"/>
 						</Trigger>
 						<Trigger Property="HasItems" Value="false">
 							<Setter Property="Height" TargetName="DropDownBorder" Value="95"/>
 						</Trigger>
 						<Trigger Property="IsEnabled" Value="false">
 							<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
 							<Setter Property="Background" Value="#FFF4F4F4"/>
 						</Trigger>
 						<Trigger Property="IsGrouping" Value="true">
 							<Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
 						</Trigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
 		<Style.Triggers>
 			<Trigger Property="IsEditable" Value="true">
 			</Trigger>
 		</Style.Triggers>
 	</Style>
 </ResourceDictionary>
--- a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/magnifier.png
+++ b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/magnifier.png
--- a/src/Main/Base/Project/Src/Services/Debugger/TreeNode.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/TreeNode.cs
@ -1,128 +0,0 @@
 // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under the BSD license (for details please see \src\AddIns\Debugger\Debugger.AddIn\license.txt)
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Media;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Debugging;
 namespace ICSharpCode.SharpDevelop.Debugging
 {
 	/// <summary>
 	/// A node in the variable tree.
 	/// The node is imutable.
 	/// </summary>
 	public class TreeNode: IComparable<TreeNode>, ITreeNode
 	{
 		IImage iconImage = null;
 		string name  = string.Empty;
 		string text  = string.Empty;
 		string type  = string.Empty;
 		IEnumerable<TreeNode> childNodes = null;
 		/// <summary>
 		/// The image displayed for this node.
 		/// </summary>
 		public IImage IconImage {
 			get { return iconImage; }
 			set { iconImage = value; }
 		} 
 		/// <summary>
 		/// System.Windows.Media.ImageSource version of <see cref="IconImage"/>.
 		/// </summary>
 		public ImageSource ImageSource {
 			get { 
 				return iconImage == null ? null : iconImage.ImageSource;
 			}
 		}
 		/// <summary>
 		/// System.Drawing.Image version of <see cref="IconImage"/>.
 		/// </summary>
 		public Image Image {
 			get { 
 				return iconImage == null ? null : iconImage.Bitmap;
 			}
 		}
 		public string Name {
 			get { return name; }
 			set { name = value; }
 		}
 		public virtual string FullName {
 			get { return name; }
 			set { name = value; }
 		}
 		public virtual string Text
 		{
 			get { return text; }
 			set { text = value; }
 		}
 		public virtual string Type {
 			get { return type; }
 			protected set { type = value; }
 		}
 		public virtual IEnumerable<TreeNode> ChildNodes {
 			get { return childNodes; }
 			protected set { childNodes = value; }
 		}
 		IEnumerable<ITreeNode> ITreeNode.ChildNodes {
 			get { return childNodes; }
 		}
 		public virtual bool HasChildNodes {
 			get { return childNodes != null; }
 		}
 		public virtual bool CanSetText { 
 			get { return false; }
 		}
 		public virtual IEnumerable<IVisualizerCommand> VisualizerCommands {
 			get {
 				return null;
 			}
 		}
 		public virtual bool HasVisualizerCommands {
 			get {
 				return (VisualizerCommands != null) && (VisualizerCommands.Count() > 0);
 			}
 		}
 		public bool IsPinned { get; set; }
 		public TreeNode()
 		{
 		}
 		public TreeNode(IImage iconImage, string name, string text, string type, IEnumerable<TreeNode> childNodes)
 		{
 			this.iconImage = iconImage;
 			this.name = name;
 			this.text = text;
 			this.type = type;
 			this.childNodes = childNodes;
 		}
 		public int CompareTo(TreeNode other)
 		{
 			return this.Name.CompareTo(other.Name);
 		}
 		public virtual bool SetText(string newValue) { 
 			return false;
 		}
 	}
 }