From 3c80f2700cd024b96464a2ff2f2345b775ea750a Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 31 Jul 2020 14:43:24 +0800
Subject: [PATCH] style(*): show window title in Windows Taskbar; add icon for
 about dialog

---
 SourceGit/UI/About.xaml             | 9 +++++++--
 SourceGit/UI/Blame.xaml             | 3 ++-
 SourceGit/UI/FileHistories.xaml     | 5 +++--
 SourceGit/UI/InteractiveRebase.xaml | 3 ++-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/SourceGit/UI/About.xaml b/SourceGit/UI/About.xaml
index a4264255..823d9b13 100644
--- a/SourceGit/UI/About.xaml
+++ b/SourceGit/UI/About.xaml
@@ -6,6 +6,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
         Height="280" Width="400"
+        Title="About"
         WindowStartupLocation="CenterOwner" ResizeMode="NoResize">
 
     <!-- Enable WindowChrome Feature -->
@@ -24,16 +25,20 @@
             <!-- Titlebar -->
             <Grid Grid.Row="0" Background="{StaticResource Brush.BG4}">
                 <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
 
+                <!-- LOGO -->
+                <Path Width="20" Height="20" Margin="6,-1,2,0" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Info}"/>
+
                 <!-- Title -->
-                <Label Content="ABOUT" FontWeight="Light"/>
+                <Label Grid.Column="1" Content="ABOUT" FontWeight="Light"/>
 
                 <!-- Close Button -->
-                <Button Click="Quit" Width="32" Grid.Column="2" WindowChrome.IsHitTestVisibleInChrome="True">
+                <Button Click="Quit" Width="32" Grid.Column="3" WindowChrome.IsHitTestVisibleInChrome="True">
                     <Button.Style>
                         <Style TargetType="{x:Type Button}" BasedOn="{StaticResource Style.Button.HighlightHover}">
                             <Style.Triggers>
diff --git a/SourceGit/UI/Blame.xaml b/SourceGit/UI/Blame.xaml
index 02ec7a98..f61c6e9f 100644
--- a/SourceGit/UI/Blame.xaml
+++ b/SourceGit/UI/Blame.xaml
@@ -4,7 +4,8 @@
         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"
-        mc:Ignorable="d"
+        mc:Ignorable="d"
+        Title="Blame"
         Height="600" Width="800">
 
     <!-- Enable WindowChrome -->
diff --git a/SourceGit/UI/FileHistories.xaml b/SourceGit/UI/FileHistories.xaml
index a8bce5f3..ea3347b6 100644
--- a/SourceGit/UI/FileHistories.xaml
+++ b/SourceGit/UI/FileHistories.xaml
@@ -6,8 +6,9 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SourceGit.UI"
         xmlns:git="clr-namespace:SourceGit.Git"
-        mc:Ignorable="d"
-         Height="600" Width="800">
+        mc:Ignorable="d"        
+        Title="File Histories"
+        Height="600" Width="800">
 
     <!-- Enable WindowChrome -->
     <WindowChrome.WindowChrome>
diff --git a/SourceGit/UI/InteractiveRebase.xaml b/SourceGit/UI/InteractiveRebase.xaml
index 8af9c162..7b91d882 100644
--- a/SourceGit/UI/InteractiveRebase.xaml
+++ b/SourceGit/UI/InteractiveRebase.xaml
@@ -6,7 +6,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SourceGit.UI"
         xmlns:helpers="clr-namespace:SourceGit.Helpers"
-        mc:Ignorable="d"
+        mc:Ignorable="d"        
+        Title="Interactive Rebase"
         Height="600" Width="800">
 
     <!-- Enable WindowChrome -->