Wrap Item in ViewBox

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/WrapItemContextMenu.xaml

@@ -0,0 +1,11 @@
+<ContextMenu x:Class="ICSharpCode.WpfDesign.Designer.Extensions.WrapItemContextMenu"
+             xmlns="http://schemas.microsoft.com/netfx/2007/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:Translation="clr-namespace:ICSharpCode.WpfDesign.Designer"
+>
+    <MenuItem Header="{Binding WrapInViewbox, Source={x:Static Translation:Translations.Instance}}" Click="Click_WrapInViewbox">
+        <MenuItem.Icon>
+            <Image Source="/ICSharpCode.WpfDesign.Designer;component/Images/wrap-option.png" />
+        </MenuItem.Icon>
+    </MenuItem>
+</ContextMenu>

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/WrapItemContextMenu.xaml.cs

@@ -0,0 +1,41 @@
+// 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.Linq;
+using System.Windows.Controls;
+
+namespace ICSharpCode.WpfDesign.Designer.Extensions
+{
+	public partial class WrapItemContextMenu
+	{
+		private DesignItem designItem;
+
+        public WrapItemContextMenu(DesignItem designItem)
+		{
+			this.designItem = designItem;
+			
+			InitializeComponent();
+		}
+
+        void Click_WrapInViewbox(object sender, System.Windows.RoutedEventArgs e)
+		{
+			ModelTools.WrapItemsNewContainer(this.designItem.Services.Selection.SelectedItems, typeof(Viewbox));
+		}		
+	}
+}

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

@@ -0,0 +1,57 @@
+// 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.Windows;
+using System.Windows.Controls;
+using ICSharpCode.WpfDesign.Adorners;
+using ICSharpCode.WpfDesign.Extensions;
+using ICSharpCode.WpfDesign.Designer;
+
+namespace ICSharpCode.WpfDesign.Designer.Extensions
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	[ExtensionServer(typeof(OnlyOneItemSelectedExtensionServer))]
+	[ExtensionFor(typeof(UIElement))]
+	[Extension(Order = 50)]
+    public class WrapItemContextMenuExtension : SelectionAdornerProvider
+	{
+		DesignPanel panel;
+		ContextMenu contextMenu;
+
+		protected override void OnInitialized()
+		{
+			base.OnInitialized();
+
+            contextMenu = new WrapItemContextMenu(ExtendedItem);
+			panel = ExtendedItem.Context.Services.DesignPanel as DesignPanel;
+			if (panel != null)
+				panel.AddContextMenu(contextMenu);
+		}
+		
+		protected override void OnRemove()
+		{
+			if (panel != null)
+				panel.RemoveContextMenu(contextMenu);
+
+			base.OnRemove();
+		}
+	}
+}

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/WrapItemsContextMenu.xaml

@@ -3,8 +3,12 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:Translation="clr-namespace:ICSharpCode.WpfDesign.Designer"
 >
-	<MenuItem Header="{Binding WrapInCanvas, Source={x:Static Translation:Translations.Instance}}" Click="Click_WrapInCanvas" />
-	<MenuItem Header="{Binding WrapInGrid, Source={x:Static Translation:Translations.Instance}}" Click="Click_WrapInGrid">
+	<MenuItem Header="{Binding WrapInCanvas, Source={x:Static Translation:Translations.Instance}}" Click="Click_WrapInCanvas">
+        <MenuItem.Icon>
+            <Image Width="16" Source="/ICSharpCode.WpfDesign.Designer;component/Images/canvas.png" />
+        </MenuItem.Icon>
+    </MenuItem>
+        <MenuItem Header="{Binding WrapInGrid, Source={x:Static Translation:Translations.Instance}}" Click="Click_WrapInGrid">
 		<MenuItem.Icon>
 			<Image Source="/ICSharpCode.WpfDesign.Designer;component/Images/grid.png" />
 		</MenuItem.Icon>

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

@@ -284,8 +284,6 @@ namespace ICSharpCode.WpfDesign.Designer
 			var ymax = itemList.Max(x => x.Ymax);
 
 			foreach (var item in itemList) {
-				newPanel.ContentProperty.CollectionElements.Add(item.DesignItem);
-				
 				if (newPanel.Component is Canvas) {
 					if (item.HorizontalAlignment == HorizontalAlignment.Right) {
 						item.DesignItem.Properties.GetAttachedProperty(Canvas.RightProperty).SetValue(xmax - item.Xmax);
@@ -298,6 +296,9 @@ namespace ICSharpCode.WpfDesign.Designer
 					} else {
 						item.DesignItem.Properties.GetAttachedProperty(Canvas.TopProperty).SetValue(item.Ymin - ymin);
 					}
+
+                    newPanel.ContentProperty.CollectionElements.Add(item.DesignItem);
+
 				} else if (newPanel.Component is Grid) {
 					Thickness thickness = new Thickness(0);
 					if (item.HorizontalAlignment == HorizontalAlignment.Right) {
@@ -317,6 +318,11 @@ namespace ICSharpCode.WpfDesign.Designer
 					}
 					
 					item.DesignItem.Properties.GetProperty(FrameworkElement.MarginProperty).SetValue(thickness);
+
+                    newPanel.ContentProperty.CollectionElements.Add(item.DesignItem);
+
+				} else if (newPanel.Component is Viewbox) {
+                    newPanel.ContentProperty.SetValue(item.DesignItem);
 				}
 			}
 			

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

@@ -77,13 +77,19 @@ namespace ICSharpCode.WpfDesign.Designer
 				return "Wrap in Grid";
 			}
 		}
-		
+        
 		public virtual string WrapInBorder {
 			get {
 				return "Wrap in Border";
 			}
 		}
 
+        public virtual string WrapInViewbox {
+			get {
+				return "Wrap in Viewbox";
+			}
+		}
+
 		public virtual string FormatedTextEditor
 		{
 			get

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj

@@ -101,8 +101,12 @@
     <Compile Include="Extensions\ArrangeItemsContextMenu.xaml.cs">
       <DependentUpon>ArrangeItemsContextMenu.xaml</DependentUpon>
     </Compile>
-    <Compile Include="OutlineView\OutlineNodeBase.cs" />
+    <Compile Include="Extensions\WrapItemContextMenu.xaml.cs">
+      <DependentUpon>WrapItemContextMenu.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Extensions\WrapItemsContextMenuExtension.cs" />
+    <Compile Include="OutlineView\OutlineNodeBase.cs" />
+    <Compile Include="Extensions\WrapItemContextMenuExtension.cs" />
     <Compile Include="Extensions\WrapItemsContextMenu.xaml.cs">
       <DependentUpon>WrapItemsContextMenu.xaml</DependentUpon>
     </Compile>
@@ -288,6 +292,9 @@
     <Page Include="Extensions\ArrangeItemsContextMenu.xaml">
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Extensions\WrapItemContextMenu.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Extensions\WrapItemsContextMenu.xaml">
       <SubType>Designer</SubType>
     </Page>
@@ -445,4 +452,10 @@
   <ItemGroup>
     <Resource Include="Images\paint-can-color.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\wrap-option.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\canvas.png" />
+  </ItemGroup>
 </Project>