DynamoDS
diff --git a/‎src/DynamoCoreWpf/DynamoCoreWpf.csproj
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions b/‎src/DynamoCoreWpf/DynamoCoreWpf.csproj
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/Extensions/ViewLoadedParams.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/DynamoCoreWpf/Extensions/ViewLoadedParams.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/DynamoCoreWpf/UI/Images/undock_hover.png
Copy file name to clipboard
454 Bytes b/‎src/DynamoCoreWpf/UI/Images/undock_hover.png
Copy file name to clipboard
454 Bytes
diff --git a/‎src/DynamoCoreWpf/UI/Images/undock_normal.png
Copy file name to clipboard
456 Bytes b/‎src/DynamoCoreWpf/UI/Images/undock_normal.png
Copy file name to clipboard
456 Bytes
diff --git a/‎src/DynamoCoreWpf/ViewModels/Core/StateMachine.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/DynamoCoreWpf/ViewModels/Core/StateMachine.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/DynamoCoreWpf/Views/Core/DynamoView.xaml
Copy file name to clipboard
+20Lines changed: 20 additions & 0 deletions b/‎src/DynamoCoreWpf/Views/Core/DynamoView.xaml
Copy file name to clipboard
+20Lines changed: 20 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
Copy file name to clipboard
+103-5Lines changed: 103 additions & 5 deletions b/‎src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
Copy file name to clipboard
+103-5Lines changed: 103 additions & 5 deletions
@@ -364,6 +364,9 @@
     <Compile Include="ViewModels\Preview\Watch3DFullscreenViewModel.cs" />
     <Compile Include="ViewModels\Preview\WatchViewModel.cs" />
     <Compile Include="ViewModels\Core\WorkspaceViewModel.cs" />
+    <Compile Include="Windows\ExtensionWindow.xaml.cs">
+      <DependentUpon>ExtensionWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Windows\ModelessChildWindow.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -375,6 +378,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Windows\ExtensionWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Page Include="Controls\InCanvasSearchControl.xaml">
@@ -1240,6 +1247,8 @@
     <Content Include="sharpdx_direct3d11_effects_x86.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Resource Include="UI\Images\undock_hover.png" />
+    <Resource Include="UI\Images\undock_normal.png" />
     <None Include="ViewModels\Watch3D\shaderSource\helix_shader_defs\COMMON\Common.hlsl" />
     <None Include="ViewModels\Watch3D\shaderSource\helix_shader_defs\COMMON\CommonBuffers.hlsl" />
     <None Include="ViewModels\Watch3D\shaderSource\helix_shader_defs\COMMON\DataStructs.hlsl" />
 
@@ -117,7 +117,7 @@ public void AddToExtensionsSideBar(IViewExtension viewExtension, ContentControl
         /// <returns></returns>
         public void CloseExtensioninInSideBar(IViewExtension viewExtension)
         {
-            dynamoView.CloseExtensionTabItem(viewExtension);
+            dynamoView.CloseExtensionControl(viewExtension);
         }
 
         public void AddSeparator(MenuBarType type, Separator separatorObj, int index = -1)
 
@@ -992,7 +992,7 @@ private void InitiateWindowSelectionSequence()
                 args = new SelectionBoxUpdateArgs(mouseDownPos.X, mouseDownPos.Y, 0, 0);
                 args.SetVisibility(Visibility.Visible);
 
-                this.owningWorkspace.RequestSelectionBoxUpdate(this, args);
+                this.owningWorkspace.OnRequestSelectionBoxUpdate(this, args);
 
                 SetCurrentState(State.WindowSelection);
             }
 
@@ -1771,6 +1771,26 @@
                                     </Image.Style>
                                 </Image>
                             </Button>
+                            <!-- Undock -->
+                            <Button Name="UndockButton" Style="{StaticResource CloseButtonStyle}" DockPanel.Dock="Right" Click="UndockExtensionTab"
+                                    CommandParameter="{Binding RelativeSource={RelativeSource AncestorType={x:Type TabItem}}, Path=Name}">
+                                <Image Width="14" Height="14" HorizontalAlignment="Right" VerticalAlignment="Center">
+                                    <Image.Style>
+                                        <Style TargetType="{x:Type Image}">
+                                            <Style.Triggers>
+                                                <Trigger Property="IsMouseOver" Value="False">
+                                                    <Setter Property="Source"
+                                                            Value="/DynamoCoreWpf;component/UI/Images/undock_normal.png" />
+                                                </Trigger>
+                                                <Trigger Property="IsMouseOver" Value="True">
+                                                    <Setter Property="Source"
+                                                            Value="/DynamoCoreWpf;component/UI/Images/undock_hover.png" />
+                                                </Trigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </Image.Style>
+                                </Image>
+                            </Button>
                         </DockPanel>
                     </DataTemplate>
 
 
@@ -43,6 +43,7 @@
 using Dynamo.Wpf.Views.Debug;
 using Dynamo.Wpf.Views.Gallery;
 using Dynamo.Wpf.Views.PackageManager;
+using Dynamo.Wpf.Windows;
 using HelixToolkit.Wpf.SharpDX;
 using ResourceNames = Dynamo.Wpf.Interfaces.ResourceNames;
 using String = System.String;
@@ -79,6 +80,11 @@ public partial class DynamoView : Window, IDisposable
         /// </summary>
         internal static event Action<String> CloseExtension;
         internal ObservableCollection<TabItem> ExtensionTabItems { set; get; } = new ObservableCollection<TabItem>();
+        /// <summary>
+        /// Extensions currently displayed as windows.
+        /// Made internal for testing purposes only.
+        /// </summary>
+        internal Dictionary<string, ExtensionWindow> ExtensionWindows { get; set; } = new Dictionary<string, ExtensionWindow>();
         internal ViewExtensionManager viewExtensionManager;
         internal Watch3DView BackgroundPreview { get; private set; }
 
@@ -214,6 +220,14 @@ public DynamoView(DynamoViewModel dynamoViewModel)
         /// <returns>The tab item if it was added, otherwise null</returns>
         internal TabItem AddExtensionTabItem(IViewExtension viewExtension, ContentControl contentControl)
         {
+            // If the extension is showing as a window, shift focus there.
+            if (ExtensionWindows.ContainsKey(viewExtension.Name))
+            {
+                var window = ExtensionWindows[viewExtension.Name];
+                window.Focus();
+                return null;
+            }
+
             var tab = FindExtensionTab(viewExtension);
             if (tab == null)
             {
@@ -222,7 +236,7 @@ internal TabItem AddExtensionTabItem(IViewExtension viewExtension, ContentContro
                 // creates a new tab item
                 tab = new TabItem();
                 tab.Header = viewExtension.Name;
-                tab.Tag = viewExtension.GetType();
+                tab.Tag = viewExtension;
                 tab.Uid = viewExtension.UniqueId;
                 tab.HeaderTemplate = tabDynamic.FindResource("TabHeader") as DataTemplate;
 
@@ -234,7 +248,10 @@ internal TabItem AddExtensionTabItem(IViewExtension viewExtension, ContentContro
                 }
                 else
                 {
-                    tab.Content = contentControl.Content;
+                    if (contentControl != null)
+                    {
+                        tab.Content = contentControl.Content;
+                    }
                     var extensionWindow = contentControl as Window;
                     if (extensionWindow != null)
                     {
@@ -263,16 +280,17 @@ internal TabItem AddExtensionTabItem(IViewExtension viewExtension, ContentContro
         }
 
         /// <summary>
-        /// This method will close a tab item in the right side bar based on passed extension
+        /// This method will close an extension control, whether it's on the side bar or undocked as a window.
         /// </summary>
         /// <param name="viewExtension">Extension to be closed</param>
         /// <returns></returns>
-        internal void CloseExtensionTabItem(IViewExtension viewExtension)
+        internal void CloseExtensionControl(IViewExtension viewExtension)
         {
             string tabName = viewExtension.Name;
             TabItem tabitem = ExtensionTabItems.OfType<TabItem>().SingleOrDefault(n => n.Header.ToString() == tabName);
             CloseExtension?.Invoke(tabName);
             CloseExtensionTab(tabitem);
+            CloseExtensionWindow(tabName);
         }
 
         /// <summary>
@@ -322,6 +340,86 @@ private void CloseExtensionTab(TabItem tabitem)
             }
         }
 
+        private void CloseExtensionWindow(string name)
+        {
+            if (ExtensionWindows.ContainsKey(name))
+            {
+                var extension = ExtensionWindows[name];
+                extension.Close();
+                ExtensionWindows.Remove(name);
+            }
+        }
+
+        internal void UndockExtensionTab(object sender, RoutedEventArgs e)
+        {
+            var tabName = (sender as Button).DataContext.ToString();
+            UndockExtension(tabName);
+        }
+
+        /// <summary>
+        /// Undocks the extension with the given name.
+        /// Made internal for testing purposes only.
+        /// </summary>
+        /// <param name="name">Name of the extension</param>
+        internal void UndockExtension(string name)
+        {
+            var tabItem = ExtensionTabItems.OfType<TabItem>().SingleOrDefault(tab => tab.Header.ToString() == name);
+            CloseExtensionTab(tabItem);
+
+            var ext = new ExtensionWindow();
+            // Icon is passed from DynamoView (respecting Host integrator icon)
+            SetApplicationIcon();
+            ext.Icon = this.Icon;
+            ext.Owner = this;
+            var content = tabItem.Content as ContentControl;
+            // Disconnect from previous parent to avoid error
+            tabItem.Content = null;
+            ext.ExtensionContent.Content = content;
+            ext.Title = name;
+            ext.Tag = tabItem.Tag;
+            ext.Uid = tabItem.Uid;
+            ext.Closed += ExtensionWindow_Closed;
+            ext.Show();
+
+            ExtensionWindows.Add(name, ext);
+        }
+
+        /// <summary>
+        /// Sets DynamoView icon to that of the currently running application. This is set for reuse
+        /// in custom child windows rather than for the main window itself, which is not customized.
+        /// </summary>
+        private void SetApplicationIcon()
+        {
+            if (this.Icon == null && !DynamoModel.IsTestMode)
+            {
+                var icon = System.Drawing.Icon.ExtractAssociatedIcon(System.Reflection.Assembly.GetEntryAssembly().Location);
+                var bmp = icon.ToBitmap();
+                MemoryStream stream = new MemoryStream();
+                bmp.Save(stream, System.Drawing.Imaging.ImageFormat.Png);
+                stream.Seek(0, SeekOrigin.Begin);
+                PngBitmapDecoder pngDecoder = new PngBitmapDecoder(stream, BitmapCreateOptions.None, BitmapCacheOption.Default);
+                this.Icon = pngDecoder.Frames[0];
+            }
+        }
+
+        private void ExtensionWindow_Closed(object sender, EventArgs e)
+        {
+            var ext = sender as ExtensionWindow;
+            var extName = ext.Title;
+            var content = ext.ExtensionContent.Content as ContentControl;
+            // Release content from window
+            ext.ExtensionContent.Content = null;
+            ExtensionWindows.Remove(extName);
+            if (ext.DockRequested)
+            {
+                AddExtensionTabItem((IViewExtension)ext.Tag, content);
+            }
+            else
+            {
+                CloseExtension?.Invoke(extName);
+            }
+        }
+
         // This event is triggered when the tabitems list is changed and will show/hide the right side bar accordingly.
         private void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
@@ -330,7 +428,7 @@ private void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs
 
         private TabItem FindExtensionTab(IViewExtension viewExtension)
         {
-            return ExtensionTabItems.FirstOrDefault(tab => tab.Tag.Equals(viewExtension.GetType()));
+            return ExtensionTabItems.FirstOrDefault(tab => ((IViewExtension)tab.Tag).GetType().Equals(viewExtension.GetType()));
         }
 
         private void OnRequestReturnFocusToView()
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public void AddToExtensionsSideBar(IViewExtension viewExtension, ContentControl`
`117`	`117`	`/// <returns></returns>`
`118`	`118`	`public void CloseExtensioninInSideBar(IViewExtension viewExtension)`
`119`	`119`	`{`
`120`		`- dynamoView.CloseExtensionTabItem(viewExtension);`
	`120`	`+ dynamoView.CloseExtensionControl(viewExtension);`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`public void AddSeparator(MenuBarType type, Separator separatorObj, int index = -1)`
Original file line number	Diff line number	Diff line change
`@@ -992,7 +992,7 @@ private void InitiateWindowSelectionSequence()`
`992`	`992`	`args = new SelectionBoxUpdateArgs(mouseDownPos.X, mouseDownPos.Y, 0, 0);`
`993`	`993`	`args.SetVisibility(Visibility.Visible);`
`994`	`994`
`995`		`- this.owningWorkspace.RequestSelectionBoxUpdate(this, args);`
	`995`	`+ this.owningWorkspace.OnRequestSelectionBoxUpdate(this, args);`
`996`	`996`
`997`	`997`	`SetCurrentState(State.WindowSelection);`
`998`	`998`	`}`