More fies for Image COntrol, Container Enter,...

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

@@ -32,7 +32,7 @@ namespace ICSharpCode.WpfDesign.Designer.Controls
 	/// <summary>
 	/// A control that displays adorner panels.
 	/// </summary>
-	sealed class AdornerLayer : Panel
+	public sealed class AdornerLayer : Panel
 	{
 		#region AdornerPanelCollection
 		internal sealed class AdornerPanelCollection : ICollection<AdornerPanel>, IReadOnlyCollection<AdornerPanel>
@@ -222,22 +222,20 @@ namespace ICSharpCode.WpfDesign.Designer.Controls
 		protected override Size ArrangeOverride(Size finalSize)
 		{
 			foreach (AdornerPanel adorner in this.Children) {				
-				if (adorner.AdornedElement.IsDescendantOf(_designPanel)) {
+				if (adorner.AdornedElement.IsDescendantOf(_designPanel))
-					adorner.RenderTransform = (Transform)adorner.AdornedElement.TransformToAncestor(_designPanel);
+				{
+				    var rt = (MatrixTransform) adorner.AdornedElement.TransformToAncestor(_designPanel);
+                    if (adorner.AdornedDesignItem != null && adorner.AdornedDesignItem.Parent != null && adorner.AdornedDesignItem.Parent.View is Canvas && adorner.AdornedElement.RenderSize.Height == 0 && adorner.AdornedElement.RenderSize.Width == 0)
+                    {
+                        var xOffset = rt.Matrix.OffsetX - (((FrameworkElement)adorner.AdornedElement).Width / 2);
+                        var yOffset = rt.Matrix.OffsetY - (((FrameworkElement)adorner.AdornedElement).Height / 2);
+                        rt = new MatrixTransform(new Matrix(rt.Matrix.M11, rt.Matrix.M12, rt.Matrix.M21, rt.Matrix.M22, xOffset, yOffset));
                     }
 
-                //Fix Adorner Display of Image (or maybe other components...)
+                    adorner.RenderTransform = rt;
-
+				}
-                var size = adorner.DesiredSize;
-                //if (size.Height==0 && size.Width==0 && adorner.AdornedElement is FrameworkElement)
-                //    size = new Size(((FrameworkElement)adorner.AdornedElement).Width, ((FrameworkElement)adorner.AdornedElement).Height);
-
-                //if (double.IsNaN(size.Width))
-                //    size.Width = 0;
-                //if (double.IsNaN(size.Height))
-                //    size.Height = 0;
 
-                adorner.Arrange(new Rect(new Point(0, 0), size));
+                adorner.Arrange(new Rect(new Point(0, 0), adorner.DesiredSize));
 			}
 			return finalSize;
 		}

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

@@ -146,7 +146,7 @@ namespace ICSharpCode.WpfDesign.Designer.Controls
 						if (double.IsNaN(wr))
 						{
 							wr = (double) rightDescriptor.GetValue(adornedControl);
-							wr = canvas.ActualWidth - (adornedControl.ActualWidth + wr);
+							wr = canvas.ActualWidth - (PlacementOperation.GetRealElementSize(adornedControl).Width + wr);
 						}
 						else
 						{
@@ -167,7 +167,7 @@ namespace ICSharpCode.WpfDesign.Designer.Controls
 						if (double.IsNaN(wr))
 						{
 							wr = (double)bottomDescriptor.GetValue(adornedControl);
-							wr = canvas.ActualHeight - (adornedControl.ActualHeight + wr);
+							wr = canvas.ActualHeight - (PlacementOperation.GetRealElementSize(adornedControl).Height + wr);
 						}
 						else
 						{
@@ -188,7 +188,7 @@ namespace ICSharpCode.WpfDesign.Designer.Controls
 						if (double.IsNaN(wr))
 						{
 							wr = (double) leftDescriptor.GetValue(adornedControl);
-							wr = canvas.ActualWidth - (adornedControl.ActualWidth + wr);
+							wr = canvas.ActualWidth - (PlacementOperation.GetRealElementSize(adornedControl).Width + wr);
 						}
 						else
 						{
@@ -209,7 +209,7 @@ namespace ICSharpCode.WpfDesign.Designer.Controls
 						if (double.IsNaN(wr))
 						{
 							wr = (double)topDescriptor.GetValue(adornedControl);
-							wr = canvas.ActualHeight - (adornedControl.ActualHeight + wr);
+							wr = canvas.ActualHeight - (PlacementOperation.GetRealElementSize(adornedControl).Height + wr);
 						}
 						else
 						{

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml

@@ -333,7 +333,16 @@
 							<RowDefinition Height="5" />
 						</Grid.RowDefinitions>
 						<Path SnapsToDevicePixels="True" Grid.Row="0" Stroke="#AC0000" StrokeThickness="1.0" Data="M0,0 L1,0 M0.75,0 L0.75,1" Stretch="Fill" />
-						<TextBlock Text="{Binding Path=ActualHeight, Converter={x:Static Converters:FormatDoubleConverter.Instance}}" HorizontalAlignment="Center" Margin="8,0,0,1" Padding="1,1,1,1" FontSize="10" Grid.Row="1">
+						<TextBlock HorizontalAlignment="Center" Margin="8,0,0,1" Padding="1,1,1,1" FontSize="10" Grid.Row="1">
+							<TextBlock.Text>
+                                <MultiBinding Converter="{x:Static Converters:ControlToRealHeightConverter.Instance}" StringFormat="0"> 
+                                    <MultiBinding.Bindings> 
+                                        <Binding />
+                                        <Binding Path="ActualHeight" UpdateSourceTrigger="PropertyChanged" /> 
+                                        <Binding Path="Height" UpdateSourceTrigger="PropertyChanged" /> 
+                                    </MultiBinding.Bindings> 
+                                </MultiBinding> 
+                            </TextBlock.Text>
                             <TextBlock.LayoutTransform>
 								<RotateTransform Angle="270" CenterX="0.5" CenterY="0.5" />
 							</TextBlock.LayoutTransform>
@@ -355,7 +364,17 @@
 							<ColumnDefinition Width="5" />
 						</Grid.ColumnDefinitions>
 						<Path Grid.Column="0" Stroke="#AC0000" StrokeThickness="1" Data="M0,0 L0,1 M0,0.75 L1,0.75" Stretch="Fill" SnapsToDevicePixels="True" />
-						<TextBlock Text="{Binding Path=ActualWidth,  Converter={x:Static Converters:FormatDoubleConverter.Instance}}" HorizontalAlignment="Center" Margin="0,8,0,0" Padding="1,1,1,1" FontSize="10" Grid.Column="1" />
+						<TextBlock HorizontalAlignment="Center" Margin="0,8,0,0" Padding="1,1,1,1" FontSize="10" Grid.Column="1">
+							<TextBlock.Text>
+                                <MultiBinding Converter="{x:Static Converters:ControlToRealWidthConverter.Instance}" StringFormat="0"> 
+                                    <MultiBinding.Bindings> 
+                                        <Binding />
+                                        <Binding Path="ActualWidth" UpdateSourceTrigger="PropertyChanged" /> 
+                                        <Binding Path="Width" UpdateSourceTrigger="PropertyChanged" />                                         
+                                    </MultiBinding.Bindings> 
+                                </MultiBinding> 
+                            </TextBlock.Text>
+                        </TextBlock>
 						<Path Grid.Column="2" Stroke="#AC0000" StrokeThickness="1" Data="M0,0.75 L3,0.75 M3,0 L3,1 " Stretch="Fill" SnapsToDevicePixels="True" />
 					</Grid>
 				</ControlTemplate>

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Converters.cs

@@ -160,6 +160,36 @@ namespace ICSharpCode.WpfDesign.Designer.Converters
 		}
 	}
 
+    public class ControlToRealWidthConverter : IMultiValueConverter
+    {
+        public static readonly ControlToRealWidthConverter Instance = new ControlToRealWidthConverter();
+
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            return PlacementOperation.GetRealElementSize((UIElement)values[0]).Width;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    public class ControlToRealHeightConverter : IMultiValueConverter
+    {
+        public static readonly ControlToRealHeightConverter Instance = new ControlToRealHeightConverter();
+
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            return PlacementOperation.GetRealElementSize((UIElement)values[0]).Height;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
     public class FormatDoubleConverter : IValueConverter
 	{
 		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Justification = "converter is immutable")]

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/DesignPanel.cs

@@ -219,6 +219,15 @@ namespace ICSharpCode.WpfDesign.Designer
 		
 		//Set custom HitTestFilterCallbak
 		public HitTestFilterCallback CustomHitTestFilterBehavior { get; set; }
+
+        public AdornerLayer AdornerLayer
+	    {
+	        get
+	        {
+	            return _adornerLayer;
+	        }
+	    }
+
 	    /// <summary>
         /// Gets/Sets the design context.
         /// </summary>

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

@@ -37,24 +37,36 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
 	{
 		AdornerPanel adornerPanel;
 		AdornerPanel cachedAdornerPanel;
+        Border border;
         
         protected override void OnInitialized()
 		{
 			base.OnInitialized();
 
+            this.ExtendedItem.PropertyChanged += OnPropertyChanged;
+
             UpdateAdorner();
         }
 
+        protected override void OnRemove()
+        {
+            this.ExtendedItem.PropertyChanged -= OnPropertyChanged;
+            base.OnRemove();
+        }
+
+        void OnPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (sender == null || e.PropertyName == "Width" || e.PropertyName == "Height")
+            {
+               ((DesignPanel) this.ExtendedItem.Services.DesignPanel).AdornerLayer.UpdateAdornersForElement(this.ExtendedItem.View, true);
+            }
+        }
+
         void UpdateAdorner()
 		{
 			var element = ExtendedItem.Component as UIElement;
 			if (element != null) {
-				//if (element.IsVisible) {
 					CreateAdorner();					
-                //}
-                //else {
-                //    RemoveAdorner();
-                //}
                 }
 		}
 		
@@ -65,7 +77,7 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
 				if (cachedAdornerPanel == null) {
 					cachedAdornerPanel = new AdornerPanel();
 					cachedAdornerPanel.Order = AdornerOrder.Background;
-					var border = new Border();
+					border = new Border();
 					border.BorderThickness = new Thickness(1);
 					border.BorderBrush = new SolidColorBrush(Color.FromRgb(0xCC, 0xCC, 0xCC));
 				    border.Background = Brushes.Transparent;
@@ -87,14 +99,7 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
                 e.Handled = true;
                 this.ExtendedItem.Services.Selection.SetSelectedComponents(new DesignItem[] {this.ExtendedItem},
                     SelectionTypes.Auto);
-            }
+                ((DesignPanel) this.ExtendedItem.Services.DesignPanel).Focus();
-        }
-		
-		private void RemoveAdorner()
-		{
-			if (adornerPanel != null) {
-				Adorners.Remove(adornerPanel);
-				adornerPanel = null;
             }
         }
 	}

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

@@ -80,6 +80,9 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
 		public virtual void EndPlacement(PlacementOperation operation)
 		{
 			InfoTextEnterArea.Stop(ref infoTextEnterArea);
+
+		    this.ExtendedItem.Services.Selection.SetSelectedComponents(null);
+		    this.ExtendedItem.Services.Selection.SetSelectedComponents(operation.PlacedItems.Select(x => x.Item).ToList());
         }
 
 		public virtual Rect GetPosition(PlacementOperation operation, DesignItem item)

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

@@ -42,7 +42,6 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
 		readonly DesignItem[] extendedItemArray = new DesignItem[1];
 		IPlacementBehavior resizeBehavior;
 		PlacementOperation operation;
-		private AdornerLayer _adornerLayer;
 		
 		public RotateThumbExtension()
 		{
@@ -81,8 +80,6 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
 		
 		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(
@@ -140,7 +137,7 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
 				}
 				rtTransform.Properties["Angle"].SetValue(destAngle);
 				
-				_adornerLayer.UpdateAdornersForElement(this.ExtendedItem.View, true);
+                ((DesignPanel) this.ExtendedItem.Services.DesignPanel).AdornerLayer.UpdateAdornersForElement(this.ExtendedItem.View, true);
 			}
 		}
 

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

@@ -228,14 +228,16 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
 				AdornerPanel.SetPlacement(thumb1,
 					new RelativePlacement(HorizontalAlignment.Center, VerticalAlignment.Top) {
 						YOffset = 0,
-						XOffset = -1 * ((FrameworkElement)ExtendedItem.View).ActualWidth / 4
+						XOffset = -1 * PlacementOperation.GetRealElementSize(ExtendedItem.View).Width / 4
 					});
 				
 				AdornerPanel.SetPlacement(thumb2,
 					new RelativePlacement(HorizontalAlignment.Left, VerticalAlignment.Center) {
-						YOffset = -1 * ((FrameworkElement)ExtendedItem.View).ActualHeight / 4,
+						YOffset = -1 * PlacementOperation.GetRealElementSize(ExtendedItem.View).Height / 4,
 						XOffset = 0
 					});
+
+                ((DesignPanel)this.ExtendedItem.Services.DesignPanel).AdornerLayer.UpdateAdornersForElement(this.ExtendedItem.View, true);
            }
         }
 		

src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PlacementOperation.cs

@@ -213,8 +213,20 @@ namespace ICSharpCode.WpfDesign
         public static Size GetRealElementSize(UIElement element)
         {
             var size = element.RenderSize;
-            if (element is FrameworkElement && !double.IsNaN(((FrameworkElement)element).Width) && !double.IsNaN(((FrameworkElement)element).Height))
+            if (element is FrameworkElement && !double.IsNaN(((FrameworkElement)element).Width))
-                size = new Size(((FrameworkElement)element).Width, ((FrameworkElement)element).Height);
+                size.Width = ((FrameworkElement)element).Width;
+            if (element is FrameworkElement && !double.IsNaN(((FrameworkElement)element).Height))
+                size.Height = ((FrameworkElement)element).Height;
+
+            if (element is FrameworkElement && size.Width < ((FrameworkElement)element).MinWidth)
+                size.Width = ((FrameworkElement)element).MinWidth;
+            if (element is FrameworkElement && size.Height < ((FrameworkElement)element).MinHeight)
+                size.Height = ((FrameworkElement)element).Height;
+
+            if (element is FrameworkElement && size.Width == 0)
+                size.Width = element.DesiredSize.Width;
+            if (element is FrameworkElement && size.Height == 0)
+                size.Height = element.DesiredSize.Height;
 
             return size;
         }