Use explicit DataTemplate for GitHubDialogWindow

This ensures that the close glyph only appears once on the window.

Author: jcansdale

src/GitHub.VisualStudio.UI/Views/Dialog/GitHubDialogWindow.xaml

@@ -39,10 +39,16 @@
         <ResourceDictionary>
             <local:ViewLocator x:Key="viewLocator"/>
             <DataTemplate DataType="{x:Type ghfvs:ViewModelBase}">
-                <Border BorderThickness="1" BorderBrush="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowBorderBrushKey}}">
-                    <DockPanel>
-                        <!-- close button and padding -->
-                        <shellControls:GlyphButton x:Uid="button_Close"
+                <ContentControl Content="{Binding Converter={StaticResource viewLocator}}"/>
+            </DataTemplate>
+        </ResourceDictionary>
+    </Window.Resources>
+    <Window.ContentTemplate>
+        <DataTemplate>
+            <Border BorderThickness="1" BorderBrush="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowBorderBrushKey}}">
+                <DockPanel>
+                    <!-- close button and padding -->
+                    <shellControls:GlyphButton x:Uid="button_Close"
                                x:Name="CloseButton"
                                DockPanel.Dock="Top"
                                Width="46"
@@ -60,18 +66,17 @@
                                PressedForeground="{DynamicResource {x:Static ui:ThemedDialogColors.WindowButtonDownGlyphBrushKey}}"
                                PressedBorderBrush="{DynamicResource {x:Static ui:ThemedDialogColors.WindowButtonDownBorderBrushKey}}"
                                Click="CloseButton_Click">
-                            <Path x:Uid="path_CloseButton"
+                        <Path x:Uid="path_CloseButton"
                                 Width="16"
                                 Height="16"
                                 Fill="{Binding Path=(TextElement.Foreground), RelativeSource={RelativeSource Self}}"
                                 Data="F1M8.583,8L13,12.424 12.424,13 8,8.583 3.576,13 3,12.424 7.417,8 3,3.576 3.576,3 8,7.417 12.424,3 13,3.576z"/>
-                        </shellControls:GlyphButton>
-                        
-                        <!-- content -->
-                        <ContentControl Content="{Binding Converter={StaticResource viewLocator}}"/>
-                    </DockPanel>
-                </Border>
-            </DataTemplate>
-        </ResourceDictionary>
-    </Window.Resources>
+                    </shellControls:GlyphButton>
+
+                    <!-- content -->
+                    <ContentControl Content="{Binding Converter={StaticResource viewLocator}}"/>
+                </DockPanel>
+            </Border>
+        </DataTemplate>
+    </Window.ContentTemplate>
 </ui:DialogWindow>