Add close glyph to GitHub dialogs

Author: jcansdale

lib/14.0/Microsoft.VisualStudio.Shell.ViewManager.dll

@@ -9,6 +9,9 @@
   <Import Project="$(SolutionDir)\src\common\signing.props" />
 
   <ItemGroup>
+    <Reference Include="Microsoft.VisualStudio.Shell.ViewManager">
+      <HintPath>..\..\lib\14.0\Microsoft.VisualStudio.Shell.ViewManager.dll</HintPath>
+    </Reference>
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />

src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj

@@ -1,9 +1,10 @@
-<pfui:DialogWindow x:Class="GitHub.VisualStudio.Views.Dialog.GitHubDialogWindow"
+<ui:DialogWindow x:Class="GitHub.VisualStudio.Views.Dialog.GitHubDialogWindow"
                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                   xmlns:pfui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
+                   xmlns:ui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
+                   xmlns:shellControls="clr-namespace:Microsoft.VisualStudio.PlatformUI.Shell.Controls;assembly=Microsoft.VisualStudio.Shell.ViewManager"
                    xmlns:local="clr-namespace:GitHub.VisualStudio.Views"
                    xmlns:ghfvs="https://github.com/github/VisualStudio"
                    mc:Ignorable="d"
@@ -39,9 +40,38 @@
             <local:ViewLocator x:Key="viewLocator"/>
             <DataTemplate DataType="{x:Type ghfvs:ViewModelBase}">
                 <Border BorderThickness="1" BorderBrush="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowBorderBrushKey}}">
-                    <ContentControl Content="{Binding Converter={StaticResource viewLocator}}"/>
+                    <DockPanel>
+                        <!-- close button and padding -->
+                        <shellControls:GlyphButton x:Uid="button_Close"
+                               x:Name="CloseButton"
+                               DockPanel.Dock="Top"
+                               Width="46"
+                               Height="33"
+                               HorizontalAlignment="Right"
+                               VerticalAlignment="Top"
+                               BorderBrush="Transparent"
+                               BorderThickness="0"
+                               Background="{DynamicResource {x:Static ui:ThemedDialogColors.WindowButtonBrushKey}}"
+                               GlyphForeground="{DynamicResource {x:Static ui:ThemedDialogColors.WindowButtonGlyphBrushKey}}"
+                               HoverBackground="{DynamicResource {x:Static ui:ThemedDialogColors.WindowButtonHoverBrushKey}}"
+                               HoverForeground="{DynamicResource {x:Static ui:ThemedDialogColors.WindowButtonHoverGlyphBrushKey}}"
+                               HoverBorderBrush="{DynamicResource {x:Static ui:ThemedDialogColors.WindowButtonHoverBorderBrushKey}}"
+                               PressedBackground="{DynamicResource {x:Static ui:ThemedDialogColors.WindowButtonDownBrushKey}}"
+                               PressedForeground="{DynamicResource {x:Static ui:ThemedDialogColors.WindowButtonDownGlyphBrushKey}}"
+                               PressedBorderBrush="{DynamicResource {x:Static ui:ThemedDialogColors.WindowButtonDownBorderBrushKey}}"
+                               Click="CloseButton_Click">
+                            <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>
-</pfui:DialogWindow>
+</ui:DialogWindow>

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

@@ -15,5 +15,10 @@ public GitHubDialogWindow(IGitHubDialogWindowViewModel viewModel)
             viewModel.Done.Subscribe(_ => Close());
             InitializeComponent();
         }
+
+        void CloseButton_Click(object sender, System.Windows.RoutedEventArgs e)
+        {
+            Close();
+        }
     }
 }