Merge pull request #446 from jogibear9988/master

Many small fixes & Extensions for the WPF Designer

Author: siegfriedpammer

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/AdornerLayer.cs

@@ -221,11 +221,11 @@ protected override Size MeasureOverride(Size availableSize)
 
 		protected override Size ArrangeOverride(Size finalSize)
 		{
-			foreach (AdornerPanel adorner in this.Children) {
-				adorner.Arrange(new Rect(new Point(0, 0), adorner.DesiredSize));
+			foreach (AdornerPanel adorner in this.Children) {				
 				if (adorner.AdornedElement.IsDescendantOf(_designPanel)) {
 					adorner.RenderTransform = (Transform)adorner.AdornedElement.TransformToAncestor(_designPanel);
 				}
+				adorner.Arrange(new Rect(new Point(0, 0), adorner.DesiredSize));
 			}
 			return finalSize;
 		}

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PanelMoveAdorner.cs

@@ -54,7 +54,7 @@ public PanelMoveAdorner(DesignItem item)
 		protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
 		{
 			e.Handled = true;
-			item.Services.Selection.SetSelectedComponents(new DesignItem [] { item }, SelectionTypes.Auto);
+			//item.Services.Selection.SetSelectedComponents(new DesignItem [] { item }, SelectionTypes.Auto);
 			new DragMoveMouseGesture(item, false).Start(item.Services.DesignPanel, e);
 		}
 

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/CanvasPositionExtension.cs

@@ -28,7 +28,7 @@
 namespace ICSharpCode.WpfDesign.Designer.Extensions
 {
 	[ExtensionFor(typeof(FrameworkElement))]
-	[ExtensionServer(typeof(PrimarySelectionExtensionServer))]
+	[ExtensionServer(typeof(OnlyOneItemSelectedExtensionServer))]
 	public class CanvasPositionExtension : AdornerProvider
 	{
 		private MarginHandle[] _handles;

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/QuickOperationMenuExtension.cs

@@ -31,6 +31,7 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
 	/// <summary>
 	/// Extends the Quick operation menu for the designer.
 	/// </summary>
+	[ExtensionServer(typeof(OnlyOneItemSelectedExtensionServer))]
 	[ExtensionFor(typeof (FrameworkElement))]
 	class QuickOperationMenuExtension : PrimarySelectionAdornerProvider
 	{

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/RenderTransformOriginExtension.cs

@@ -32,6 +32,7 @@
 
 namespace ICSharpCode.WpfDesign.Designer.Extensions
 {
+	[ExtensionServer(typeof(OnlyOneItemSelectedExtensionServer))]
 	[ExtensionFor(typeof(FrameworkElement))]
 	public class RenderTransformOriginExtension : SelectionAdornerProvider
 	{

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/ResizeThumbExtension.cs

@@ -32,6 +32,7 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
 	/// <summary>
 	/// The resize thumb around a component.
 	/// </summary>
+	[ExtensionServer(typeof(OnlyOneItemSelectedExtensionServer))]
 	[ExtensionFor(typeof(FrameworkElement))]
 	public sealed class ResizeThumbExtension : SelectionAdornerProvider
 	{

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/RightClickContextMenuExtension.cs

@@ -30,6 +30,7 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
 	/// <summary>
 	/// 
 	/// </summary>
+	[ExtensionServer(typeof(OnlyOneItemSelectedExtensionServer))]
 	[ExtensionFor(typeof(UIElement))]
 	public sealed class RightClickContextMenuExtension : PrimarySelectionAdornerProvider
 	{

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/RotateThumbExtension.cs

@@ -32,6 +32,7 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
 	/// <summary>
 	/// The resize thumb around a component.
 	/// </summary>
+	[ExtensionServer(typeof(OnlyOneItemSelectedExtensionServer))]
 	[ExtensionFor(typeof(FrameworkElement))]
 	public sealed class RotateThumbExtension : SelectionAdornerProvider
 	{
@@ -41,6 +42,7 @@ public sealed class RotateThumbExtension : SelectionAdornerProvider
 		readonly DesignItem[] extendedItemArray = new DesignItem[1];
 		IPlacementBehavior resizeBehavior;
 		PlacementOperation operation;
+		private AdornerLayer _adornerLayer;
 
 		public RotateThumbExtension()
 		{
@@ -64,6 +66,7 @@ ResizeThumb CreateRotateThumb()
 			DragListener drag = new DragListener(rotateThumb);
 			drag.Started += drag_Rotate_Started;
 			drag.Changed += drag_Rotate_Changed;
+			drag.Completed += drag_Rotate_Completed;
 			return rotateThumb;
 		}
 
@@ -75,10 +78,11 @@ ResizeThumb CreateRotateThumb()
 		private RotateTransform rotateTransform;
 		private double initialAngle;
 		private DesignItem rtTransform;
-		private double angle;
-
+		
 		private void drag_Rotate_Started(DragListener drag)
 		{
+			_adornerLayer = this.adornerPanel.TryFindParent<AdornerLayer>();
+
 			var designerItem = this.ExtendedItem.Component as FrameworkElement;
 			this.parent = VisualTreeHelper.GetParent(designerItem) as UIElement;
 			this.centerPoint = designerItem.TranslatePoint(
@@ -135,10 +139,16 @@ private void drag_Rotate_Changed(DragListener drag)
 					rtTransform = this.ExtendedItem.Properties[FrameworkElement.RenderTransformProperty].Value;
 				}
 				rtTransform.Properties["Angle"].SetValue(destAngle);
-				this.angle = destAngle * Math.PI / 180.0;
+				
+				_adornerLayer.UpdateAdornersForElement(this.ExtendedItem.View, true);
 			}
 		}
 
+		void drag_Rotate_Completed(ICSharpCode.WpfDesign.Designer.Controls.DragListener drag)
+		{
+			operation.Commit();
+		}
+		
 		#endregion
 
 		protected override void OnInitialized()
@@ -154,9 +164,6 @@ protected override void OnInitialized()
 
 			var designerItem = this.ExtendedItem.Component as FrameworkElement;
 			this.rotateTransform = designerItem.RenderTransform as RotateTransform;
-			
-			if (rotateTransform != null)
-				angle = rotateTransform.Angle;
 		}
 
 		void OnPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/SkewThumbExtension.cs

@@ -0,0 +1,248 @@
+// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Shapes;
+using ICSharpCode.WpfDesign.Adorners;
+using ICSharpCode.WpfDesign.Designer.Controls;
+using ICSharpCode.WpfDesign.Extensions;
+using System.Collections.Generic;
+
+namespace ICSharpCode.WpfDesign.Designer.Extensions
+{
+	[ExtensionServer(typeof(OnlyOneItemSelectedExtensionServer))]
+	[ExtensionFor(typeof(FrameworkElement))]
+	public sealed class SkewThumbExtension : SelectionAdornerProvider
+	{
+		readonly AdornerPanel adornerPanel;
+		readonly DesignItem[] extendedItemArray = new DesignItem[1];
+		
+		private AdornerLayer _adornerLayer;
+		
+		public SkewThumbExtension()
+		{
+			adornerPanel = new AdornerPanel();
+			adornerPanel.Order = AdornerOrder.BeforeForeground;
+			this.Adorners.Add(adornerPanel);
+		}
+		
+		#region Skew
+		
+		private Point startPoint;
+		private UIElement parent;
+		private SkewTransform skewTransform;
+		private double skewX;
+		private double skewY;
+		private DesignItem rtTransform;
+		private Thumb thumb1;
+		private Thumb thumb2;
+		PlacementOperation operation;
+		
+		private void dragX_Started(DragListener drag)
+		{
+			_adornerLayer = this.adornerPanel.TryFindParent<AdornerLayer>();
+			
+			var designerItem = this.ExtendedItem.Component as FrameworkElement;
+			this.parent = VisualTreeHelper.GetParent(designerItem) as UIElement;
+			
+			startPoint = Mouse.GetPosition(this.parent);
+			
+			if (this.skewTransform == null)
+			{
+				this.skewX = 0;
+				this.skewY = 0;
+			}
+			else
+			{
+				this.skewX = this.skewTransform.AngleX;
+				this.skewY = this.skewTransform.AngleY;
+			}
+			
+			rtTransform = this.ExtendedItem.Properties[FrameworkElement.RenderTransformProperty].Value;
+			
+			operation = PlacementOperation.Start(extendedItemArray, PlacementType.Resize);
+		}
+		
+		private void dragX_Changed(DragListener drag)
+		{
+			Point currentPoint = Mouse.GetPosition(this.parent);
+			Vector deltaVector = Point.Subtract(currentPoint, this.startPoint);
+			
+			var destAngle = (-0.5*deltaVector.X) + skewX;
+			
+			if (destAngle == 0 && skewY == 0)
+			{
+				this.ExtendedItem.Properties.GetProperty(FrameworkElement.RenderTransformProperty).Reset();
+				rtTransform = null;
+				skewTransform = null;
+			}
+			else
+			{
+				if (rtTransform == null)
+				{
+					if (!this.ExtendedItem.Properties.GetProperty(FrameworkElement.RenderTransformOriginProperty).IsSet) {
+						this.ExtendedItem.Properties.GetProperty(FrameworkElement.RenderTransformOriginProperty).SetValue(new Point(0.5,0.5));
+					}
+					
+					if (this.skewTransform == null)
+						this.skewTransform = new SkewTransform(0, 0);
+					this.ExtendedItem.Properties.GetProperty(FrameworkElement.RenderTransformProperty).SetValue(skewTransform);
+					rtTransform = this.ExtendedItem.Properties[FrameworkElement.RenderTransformProperty].Value;
+				}
+				rtTransform.Properties["AngleX"].SetValue(destAngle);
+			}
+			
+			_adornerLayer.UpdateAdornersForElement(this.ExtendedItem.View, true);
+		}
+		
+		void dragX_Completed(ICSharpCode.WpfDesign.Designer.Controls.DragListener drag)
+		{
+			operation.Commit();
+		}
+		
+		private void dragY_Started(DragListener drag)
+		{
+			_adornerLayer = this.adornerPanel.TryFindParent<AdornerLayer>();
+			
+			var designerItem = this.ExtendedItem.Component as FrameworkElement;
+			this.parent = VisualTreeHelper.GetParent(designerItem) as UIElement;
+			
+			startPoint = Mouse.GetPosition(this.parent);
+			
+			if (this.skewTransform == null)
+			{
+				this.skewX = 0;
+				this.skewY = 0;
+			}
+			else
+			{
+				this.skewX = this.skewTransform.AngleX;
+				this.skewY = this.skewTransform.AngleY;
+			}
+			
+			rtTransform = this.ExtendedItem.Properties[FrameworkElement.RenderTransformProperty].Value;
+			
+			operation = PlacementOperation.Start(extendedItemArray, PlacementType.Resize);
+		}
+		
+		private void dragY_Changed(DragListener drag)
+		{
+			Point currentPoint = Mouse.GetPosition(this.parent);
+			Vector deltaVector = Point.Subtract(currentPoint, this.startPoint);
+			
+			var destAngle = (-0.5*deltaVector.Y) + skewY;
+			
+			if (destAngle == 0 && skewX == 0)
+			{
+				this.ExtendedItem.Properties.GetProperty(FrameworkElement.RenderTransformProperty).Reset();
+				rtTransform = null;
+				skewTransform = null;
+			}
+			else
+			{
+				if (rtTransform == null)
+				{
+					if (!this.ExtendedItem.Properties.GetProperty(FrameworkElement.RenderTransformOriginProperty).IsSet)
+					{
+						this.ExtendedItem.Properties.GetProperty(FrameworkElement.RenderTransformOriginProperty).SetValue(new Point(0.5, 0.5));
+					}
+					
+					if (this.skewTransform == null)
+						this.skewTransform = new SkewTransform(0, 0);
+					this.ExtendedItem.Properties.GetProperty(FrameworkElement.RenderTransformProperty).SetValue(skewTransform);
+					rtTransform = this.ExtendedItem.Properties[FrameworkElement.RenderTransformProperty].Value;
+				}
+				rtTransform.Properties["AngleY"].SetValue(destAngle);
+			}
+			
+			_adornerLayer.UpdateAdornersForElement(this.ExtendedItem.View, true);
+		}
+		
+		void dragY_Completed(ICSharpCode.WpfDesign.Designer.Controls.DragListener drag)
+		{
+			operation.Commit();
+		}
+		
+		#endregion
+		
+		protected override void OnInitialized()
+		{
+			
+			if (this.ExtendedItem.Component is WindowClone)
+				return;
+			base.OnInitialized();
+			
+			extendedItemArray[0] = this.ExtendedItem;
+			this.ExtendedItem.PropertyChanged += OnPropertyChanged;
+			
+			var designerItem = this.ExtendedItem.Component as FrameworkElement;
+			this.skewTransform = designerItem.RenderTransform as SkewTransform;
+			
+			if (skewTransform != null)
+			{
+				skewX = skewTransform.AngleX;
+				skewY = skewTransform.AngleY;
+			}
+			
+			thumb1 = new Thumb() { Cursor = Cursors.ScrollWE, Height = 14, Width = 4, Opacity = 1 };
+			thumb2 = new Thumb() { Cursor = Cursors.ScrollNS, Width = 14, Height = 4, Opacity = 1 };
+			
+			OnPropertyChanged(null, null);
+			
+			adornerPanel.Children.Add(thumb1);
+			adornerPanel.Children.Add(thumb2);
+			
+			DragListener drag1 = new DragListener(thumb1);
+			drag1.Started += dragX_Started;
+			drag1.Changed += dragX_Changed;
+			drag1.Completed += dragX_Completed;
+			DragListener drag2 = new DragListener(thumb2);
+			drag2.Started += dragY_Started;
+			drag2.Changed += dragY_Changed;
+			drag2.Completed += dragY_Completed;
+		}
+		
+		void OnPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+		{
+			if (sender == null || e.PropertyName == "Width" || e.PropertyName == "Height") {
+				AdornerPanel.SetPlacement(thumb1,
+					new RelativePlacement(HorizontalAlignment.Center, VerticalAlignment.Top) {
+						YOffset = 0,
+						XOffset = -1 * ((FrameworkElement)ExtendedItem.View).ActualWidth / 4
+					});
+				
+				AdornerPanel.SetPlacement(thumb2,
+					new RelativePlacement(HorizontalAlignment.Left, VerticalAlignment.Center) {
+						YOffset = -1 * ((FrameworkElement)ExtendedItem.View).ActualHeight / 4,
+						XOffset = 0
+					});
+			}
+		}
+		
+		protected override void OnRemove()
+		{
+			this.ExtendedItem.PropertyChanged -= OnPropertyChanged;
+			base.OnRemove();
+		}
+	}
+}