Merge remote-tracking branch 'remotes/origin/WpfDesignerPropGrid'

Author: tbulle

src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.csproj

@@ -54,6 +54,7 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Design" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Drawing.Design" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml">

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/OutlineView/Outline.xaml.cs

@@ -25,10 +25,11 @@ public Outline()
 		}
 
 		public static readonly DependencyProperty RootProperty =
-			DependencyProperty.Register("Root", typeof(OutlineNode), typeof(Outline));
+			DependencyProperty.Register("Root", typeof(IOutlineNode), typeof(Outline));
 
-		public OutlineNode Root {
-			get { return (OutlineNode)GetValue(RootProperty); }
+		public IOutlineNode Root
+		{
+			get { return (IOutlineNode)GetValue(RootProperty); }
 			set { SetValue(RootProperty, value); }
 		}
 

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/OutlineView/OutlineNode.cs

@@ -19,167 +19,60 @@
 
 namespace ICSharpCode.WpfDesign.Designer.OutlineView
 {
-	public class OutlineNode : INotifyPropertyChanged
+	public interface IOutlineNode
 	{
-		//Used to check if element can enter other containers
-		public static PlacementType DummyPlacementType;
-		
-		static OutlineNode()
-		{
-			DummyPlacementType = PlacementType.Register("DummyPlacement");
-		}
-		public static OutlineNode Create(DesignItem designItem)
-		{
-			OutlineNode node;
-			if (!outlineNodes.TryGetValue(designItem, out node)) {
-				node = new OutlineNode(designItem);
-				outlineNodes[designItem] = node;
-			}
-			return node;
-		}
+		ISelectionService SelectionService { get; }
+		bool IsExpanded { get; set; }
+		DesignItem DesignItem { get; set; }
+		bool IsSelected { get; set; }
+		bool IsDesignTimeVisible { get; set; }
+		bool IsDesignTimeLocked { get; }
+		string Name { get; }
+		bool CanInsert(IEnumerable<IOutlineNode> nodes, IOutlineNode after, bool copy);
+		void Insert(IEnumerable<IOutlineNode> nodes, IOutlineNode after, bool copy);
+	}
+	
 
+	public class OutlineNode: OutlineNodeBase
+	{
 		//TODO: Reset with DesignContext
-		static Dictionary<DesignItem, OutlineNode> outlineNodes = new Dictionary<DesignItem, OutlineNode>();
+		static Dictionary<DesignItem, IOutlineNode> outlineNodes = new Dictionary<DesignItem, IOutlineNode>();
 
-		OutlineNode(DesignItem designItem)
+		protected OutlineNode(DesignItem designitem): base(designitem)
 		{
-			DesignItem = designItem;
 			UpdateChildren();
-
-			var hidden = designItem.Properties.GetAttachedProperty(DesignTimeProperties.IsHiddenProperty).ValueOnInstance;
-			if (hidden != null && (bool) hidden == true) {
-				this._isDesignTimeVisible = false;
-				((FrameworkElement) this.DesignItem.Component).Visibility = Visibility.Hidden;
-			}
-
-			var locked = designItem.Properties.GetAttachedProperty(DesignTimeProperties.IsLockedProperty).ValueOnInstance;
-			if (locked != null && (bool) locked == true) {
-				this._isDesignTimeLocked = true;
-			}
-			
-			//TODO
-			DesignItem.NameChanged += new EventHandler(DesignItem_NameChanged);
-			DesignItem.PropertyChanged += new PropertyChangedEventHandler(DesignItem_PropertyChanged);
 			SelectionService.SelectionChanged += new EventHandler<DesignItemCollectionEventArgs>(Selection_SelectionChanged);
 		}
 
-		public DesignItem DesignItem { get; private set; }
-
-		public ISelectionService SelectionService {
-			get { return DesignItem.Services.Selection; }
-		}
-
-		bool isExpanded = true;
-
-		public bool IsExpanded {
-			get {
-				return isExpanded;
-			}
-			set {
-				isExpanded = value;
-				RaisePropertyChanged("IsExpanded");
-			}
-		}
-
-		bool isSelected;
-
-		public bool IsSelected {
-			get {
-				return isSelected;
-			}
-			set {
-				if (isSelected != value) {
-					isSelected = value;
-					SelectionService.SetSelectedComponents(new[] { DesignItem },
-					                                       value ? SelectionTypes.Add : SelectionTypes.Remove);
-					RaisePropertyChanged("IsSelected");
-				}
-			}
-		}
-		
-		bool _isDesignTimeVisible = true;
-
-		public bool IsDesignTimeVisible
+		static OutlineNode()
 		{
-			get {
-				return _isDesignTimeVisible;
-			}
-			set {
-				_isDesignTimeVisible = value;
-				var ctl = DesignItem.Component as UIElement;
-				ctl.Visibility = _isDesignTimeVisible ? Visibility.Visible : Visibility.Hidden;
-
-				RaisePropertyChanged("IsDesignTimeVisible");
-
-				if (!value)
-					DesignItem.Properties.GetAttachedProperty(DesignTimeProperties.IsHiddenProperty).SetValue(true);
-				else
-					DesignItem.Properties.GetAttachedProperty(DesignTimeProperties.IsHiddenProperty).Reset();
-			}
+			DummyPlacementType = PlacementType.Register("DummyPlacement");
 		}
 
-		bool _isDesignTimeLocked = false;
-		
-		public bool IsDesignTimeLocked
+		public static IOutlineNode Create(DesignItem designItem)
 		{
-			get {
-				return _isDesignTimeLocked;
-			}
-			set {
-				_isDesignTimeLocked = value;
-				((XamlDesignItem)DesignItem).IsDesignTimeLocked = _isDesignTimeLocked;
-				
-				RaisePropertyChanged("IsDesignTimeLocked");
-
-//				if (value)
-//					DesignItem.Properties.GetAttachedProperty(DesignTimeProperties.IsLockedProperty).SetValue(true);
-//				else
-//					DesignItem.Properties.GetAttachedProperty(DesignTimeProperties.IsLockedProperty).Reset();
-			}
-		}
-		
-		ObservableCollection<OutlineNode> children = new ObservableCollection<OutlineNode>();
-
-		public ObservableCollection<OutlineNode> Children  {
-			get { return children; }
-		}
-
-		public string Name {
-			get  {
-				if (string.IsNullOrEmpty(DesignItem.Name)) {
-					return DesignItem.ComponentType.Name;
-				}
-				return DesignItem.ComponentType.Name + " (" + DesignItem.Name + ")";
+			IOutlineNode node;
+			if (!outlineNodes.TryGetValue(designItem, out node)) {
+				node = new OutlineNode(designItem);
+				outlineNodes[designItem] = node;
 			}
+			return node;
 		}
 
 		void Selection_SelectionChanged(object sender, DesignItemCollectionEventArgs e)
 		{
 			IsSelected = DesignItem.Services.Selection.IsComponentSelected(DesignItem);
 		}
 
-		void DesignItem_NameChanged(object sender, EventArgs e)
-		{
-			RaisePropertyChanged("Name");
-		}
-
-		void DesignItem_PropertyChanged(object sender, PropertyChangedEventArgs e)
-		{
-			if (e.PropertyName == DesignItem.ContentPropertyName) {
-				UpdateChildren();
-			}
-		}
-
-		void UpdateChildren()
+		protected override void UpdateChildren()
 		{
 			Children.Clear();
 
 			if (DesignItem.ContentPropertyName != null) {
 				var content = DesignItem.ContentProperty;
 				if (content.IsCollection) {
 					UpdateChildrenCore(content.CollectionElements);
-				}
-				else {
+				} else {
 					if (content.Value != null) {
 						UpdateChildrenCore(new[] { content.Value });
 					}
@@ -193,16 +86,12 @@ void UpdateChildrenCore(IEnumerable<DesignItem> items)
 				if (ModelTools.CanSelectComponent(item)) {
 					var node = OutlineNode.Create(item);
 					Children.Add(node);
-				}
-				else
-				{
+				} else {
 					var content = item.ContentProperty;
-					if (content != null)
-					{
+					if (content != null) {
 						if (content.IsCollection) {
 							UpdateChildrenCore(content.CollectionElements);
-						}
-						else {
+						} else {
 							if (content.Value != null) {
 								UpdateChildrenCore(new[] { content.Value });
 							}
@@ -211,57 +100,5 @@ void UpdateChildrenCore(IEnumerable<DesignItem> items)
 				}
 			}
 		}
-
-		public bool CanInsert(IEnumerable<OutlineNode> nodes, OutlineNode after, bool copy)
-		{
-			var placementBehavior = DesignItem.GetBehavior<IPlacementBehavior>();
-			if (placementBehavior == null)
-				return false;
-			var operation = PlacementOperation.Start(nodes.Select(node => node.DesignItem).ToArray(), DummyPlacementType);
-			if (operation != null) {
-				bool canEnter = placementBehavior.CanEnterContainer(operation, true);
-				operation.Abort();
-				return canEnter;
-			}
-			return false;
-		}
-
-		public void Insert(IEnumerable<OutlineNode> nodes, OutlineNode after, bool copy)
-		{
-			using (var moveTransaction = DesignItem.Context.OpenGroup("Item moved in outline view", nodes.Select(n => n.DesignItem).ToList())) {
-				if (copy) {
-					nodes = nodes.Select(n => OutlineNode.Create(n.DesignItem.Clone())).ToList();
-				} else {
-					foreach (var node in nodes) {
-						node.DesignItem.Remove();
-					}
-				}
-
-				var index = after == null ? 0 : Children.IndexOf(after) + 1;
-
-				var content = DesignItem.ContentProperty;
-				if (content.IsCollection) {
-					foreach (var node in nodes) {
-						content.CollectionElements.Insert(index++, node.DesignItem);
-					}
-				} else {
-					content.SetValue(nodes.First().DesignItem);
-				}
-				moveTransaction.Commit();
-			}
-		}
-
-		#region INotifyPropertyChanged Members
-
-		public event PropertyChangedEventHandler PropertyChanged;
-
-		void RaisePropertyChanged(string name)
-		{
-			if (PropertyChanged != null) {
-				PropertyChanged(this, new PropertyChangedEventArgs(name));
-			}
-		}
-
-		#endregion
 	}
 }