From 2607bad43fc56e21067f7376852a880fdbc344dc Mon Sep 17 00:00:00 2001
From: laggage <1634205628@qq.com>
Date: Thu, 30 Jan 2020 18:05:02 +0800
Subject: [PATCH] =?UTF-8?q?UI=E5=AE=8C=E5=96=84=E5=92=8C=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WinPowerHelper.Wpf/App.xaml                   |   5 +-
 WinPowerHelper.Wpf/MainWindow.xaml            |  29 ++--
 .../Styles/Controls.ComboBox.xaml             |  77 ++++++-----
 .../Styles/Themes/Light.Blue.xaml             |   2 +-
 .../Styles/Themes/Light.Pink.xaml             |   2 +-
 WinPowerHelper.Wpf/ThemeManager/Theme.cs      |   2 +-
 .../ThemeManager/ThemeManager.cs              |  53 ++++++-
 .../ViewModels/MainViewModel.cs               |  20 +++
 WinPowerHelper.Wpf/Views/WindowTitleBar.xaml  | 129 ++++++++++++++++++
 .../Views/WindowTitleBar.xaml.cs              |  36 +++++
 WinPowerHelper.Wpf/Views/cb89p-4nv71-003.ico  | Bin 0 -> 16958 bytes
 WinPowerHelper.Wpf/WinPowerHelper.Wpf.csproj  |   2 +
 12 files changed, 301 insertions(+), 56 deletions(-)
 create mode 100644 WinPowerHelper.Wpf/Views/WindowTitleBar.xaml
 create mode 100644 WinPowerHelper.Wpf/Views/WindowTitleBar.xaml.cs
 create mode 100644 WinPowerHelper.Wpf/Views/cb89p-4nv71-003.ico

diff --git a/WinPowerHelper.Wpf/App.xaml b/WinPowerHelper.Wpf/App.xaml
index cdcf5c0..7981f7e 100644
--- a/WinPowerHelper.Wpf/App.xaml
+++ b/WinPowerHelper.Wpf/App.xaml
@@ -2,7 +2,8 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:viewmodels="clr-namespace:WinPowerHelper.Wpf.ViewModels"
-             StartupUri="MainWindow.xaml">
+             StartupUri="MainWindow.xaml"
+             xmlns:system="clr-namespace:System;assembly=System.Runtime">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -11,6 +12,8 @@
             </ResourceDictionary.MergedDictionaries>
 
             <viewmodels:MainViewModel x:Key="MainViewModel"/>
+            <system:Double x:Key="Window.TitleBar.Height">32</system:Double>
+            <system:Double x:Key="FontSize.WindowTitle" >14</system:Double>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/WinPowerHelper.Wpf/MainWindow.xaml b/WinPowerHelper.Wpf/MainWindow.xaml
index 2c4ce58..b8d75b9 100644
--- a/WinPowerHelper.Wpf/MainWindow.xaml
+++ b/WinPowerHelper.Wpf/MainWindow.xaml
@@ -8,26 +8,38 @@
         xmlns:extensions="clr-namespace:WinPowerHelper.Wpf.Extensions"
         mc:Ignorable="d"
         DataContext="{StaticResource MainViewModel}"
-        Title="{Binding AppTitle}" 
-        MinHeight="240" MinWidth="420" Width="500" Height="250"
-        MaxHeight="400" MaxWidth="680" ResizeMode="CanMinimize">
+        Title="{Binding AppTitle}" WindowStyle="None"
+        MinHeight="240" MinWidth="420" Width="500" Height="200"
+        BorderThickness="1" 
+        MaxHeight="400" MaxWidth="680" ResizeMode="CanMinimize" BorderBrush="{DynamicResource Brushes.Accent}">
     <Window.Resources>
         <extensions:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
         <extensions:BoolNotConverter x:Key="BoolNotConverter" />
         <extensions:BoolToStringConverter x:Key="BoolToStringConverter"/>
+        <Style x:Key="WindowStyle1" TargetType="{x:Type Window}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Window}">
+                        <ContentPresenter />
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
         
     </Window.Resources>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="*" />
-            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
+        <views:WindowTitleBar x:Name="TitleBar"/>
         <views:TimerControl x:Name="timer" 
+                            Grid.Row="1"
                             Padding="12 3"
                             Interval="{Binding Path=Interval, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"></views:TimerControl>
-        <Border Grid.Row="1">
+        <Border Grid.Row="2">
             <WrapPanel HorizontalAlignment="Center">
                 <WrapPanel.Resources>
                     <Style TargetType="{x:Type Button}" BasedOn="{StaticResource Button.Square.Accent}">
@@ -47,7 +59,7 @@
                         Command="{Binding SetIntervalToZeroCmd}">set to zero</Button>
             </WrapPanel>
         </Border>
-        <Border Grid.Row="2" Padding="12 5">
+        <Border Grid.Row="3" Padding="12 5">
             <Grid >
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="auto"/>
@@ -65,8 +77,7 @@
                           ItemsSource="{Binding PowerOptions}" 
                           Style="{StaticResource ComboBox}"
                           SelectedValue="{Binding SelectedPowerOption, Mode=OneWayToSource, UpdateSourceTrigger=PropertyChanged, FallbackValue=Sleep}" 
-                          IsEditable="False"                          
-                          ItemContainerStyle="{StaticResource ComboBoxItem.Accent}">
+                          IsEditable="False" >
                     <ComboBox.ItemTemplate>
                         <DataTemplate DataType="{x:Type models:PowerOptions}" >
                             <TextBlock Text="{Binding Path=.,  Converter={StaticResource EnumDescriptionConverter}}"/>
diff --git a/WinPowerHelper.Wpf/Styles/Controls.ComboBox.xaml b/WinPowerHelper.Wpf/Styles/Controls.ComboBox.xaml
index ed3f642..39a93ef 100644
--- a/WinPowerHelper.Wpf/Styles/Controls.ComboBox.xaml
+++ b/WinPowerHelper.Wpf/Styles/Controls.ComboBox.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:theme="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2">
 
-    
+
     <Style x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
         <Setter Property="OverridesDefaultStyle" Value="true"/>
         <Setter Property="IsTabStop" Value="false"/>
@@ -137,6 +137,42 @@
         </Setter>
     </Style>
 
+
+
+    <Style x:Key="ComboBoxItem.Accent" TargetType="ComboBoxItem">
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="Padding" Value="{Binding Path=Padding, RelativeSource={RelativeSource AncestorType=ComboBox}}"/>
+        <Setter Property="Background" 
+                                    Value="{DynamicResource Brushes.White}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ComboBoxItem}">
+                    <Border BorderBrush="{TemplateBinding BorderBrush}"
+                                                BorderThickness="{TemplateBinding BorderThickness}"
+                                                Background="{TemplateBinding Background}">
+                        <Grid  >
+                            <ContentControl Margin="{TemplateBinding Padding}"
+                                                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                                Content="{TemplateBinding Content}"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" 
+                                                        Value="{DynamicResource Brushes.Accent3}"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter Property="Background" 
+                                                        Value="{DynamicResource Brushes.Accent}"/>
+                            <Setter Property="Foreground"
+                                                        Value="{DynamicResource Brushes.White}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <Style x:Key="ComboBox" TargetType="{x:Type ComboBox}">
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="BorderBrush" Value="{DynamicResource Brushes.Black}"/>
@@ -144,13 +180,14 @@
         <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
         <Setter Property="SnapsToDevicePixels" Value="True"/>
         <Setter Property="Padding" Value="6 8"/>
+        <Setter Property="ItemContainerStyle" Value="{StaticResource ComboBoxItem.Accent}"/>
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <!--<Setter Property="OverridesDefaultStyle" Value="True"/>-->
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ComboBox}">
                     <Grid x:Name="templateRoot" 
-                          SnapsToDevicePixels="true">    
+                          SnapsToDevicePixels="true">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*"/>
                             <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/>
@@ -205,7 +242,7 @@
                                           IsHitTestVisible="false" 
                                           Margin="{TemplateBinding Padding}" 
                                           SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
-                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>  
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="HasDropShadow" SourceName="PART_Popup" Value="true">
@@ -232,38 +269,4 @@
             </Setter.Value>
         </Setter>
     </Style>
-
-    <Style x:Key="ComboBoxItem.Accent" TargetType="ComboBoxItem">
-        <Setter Property="OverridesDefaultStyle" Value="True"/>
-        <Setter Property="Padding" Value="{Binding Path=Padding, RelativeSource={RelativeSource AncestorType=ComboBox}}"/>
-        <Setter Property="Background" 
-                                    Value="{DynamicResource Brushes.White}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ComboBoxItem}">
-                    <Border BorderBrush="{TemplateBinding BorderBrush}"
-                                                BorderThickness="{TemplateBinding BorderThickness}"
-                                                Background="{TemplateBinding Background}">
-                        <Grid  >
-                            <ContentControl Margin="{TemplateBinding Padding}"
-                                                                ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                                Content="{TemplateBinding Content}"/>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" 
-                                                        Value="{DynamicResource Brushes.Accent3}"/>
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter Property="Background" 
-                                                        Value="{DynamicResource Brushes.Accent}"/>
-                            <Setter Property="Foreground"
-                                                        Value="{DynamicResource Brushes.White}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/WinPowerHelper.Wpf/Styles/Themes/Light.Blue.xaml b/WinPowerHelper.Wpf/Styles/Themes/Light.Blue.xaml
index 1b385ff..223315c 100644
--- a/WinPowerHelper.Wpf/Styles/Themes/Light.Blue.xaml
+++ b/WinPowerHelper.Wpf/Styles/Themes/Light.Blue.xaml
@@ -5,7 +5,7 @@
                     xmlns:system="clr-namespace:System;assembly=System.Runtime"
                     mc:Ignorable="options">
     <system:String x:Key="Theme.Name">Light.Blue</system:String>
-    <system:String x:Key="Them.DisplayName">Blue (Light)</system:String>
+    <system:String x:Key="Theme.DisplayName">Blue (Light)</system:String>
     <system:String x:Key="Theme.BaseColorScheme">Light</system:String>
     <system:String x:Key="Theme.ColorScheme">Blue</system:String>
     <SolidColorBrush x:Key="Theme.ShowcaseBrush" Color="#FF0078D7" options:Freeze="True" />
diff --git a/WinPowerHelper.Wpf/Styles/Themes/Light.Pink.xaml b/WinPowerHelper.Wpf/Styles/Themes/Light.Pink.xaml
index 9c80db1..2a23309 100644
--- a/WinPowerHelper.Wpf/Styles/Themes/Light.Pink.xaml
+++ b/WinPowerHelper.Wpf/Styles/Themes/Light.Pink.xaml
@@ -6,7 +6,7 @@
                     mc:Ignorable="options">
 
   <system:String x:Key="Theme.Name">Light.Pink</system:String>
-  <system:String x:Key="Them.DisplayName">Pink (Light)</system:String>
+  <system:String x:Key="Theme.DisplayName">Pink (Light)</system:String>
   <system:String x:Key="Theme.BaseColorScheme">Light</system:String>
   <system:String x:Key="Theme.ColorScheme">Pink</system:String>
   <SolidColorBrush x:Key="Theme.ShowcaseBrush" Color="#FFF472D0" options:Freeze="True" />
diff --git a/WinPowerHelper.Wpf/ThemeManager/Theme.cs b/WinPowerHelper.Wpf/ThemeManager/Theme.cs
index 70e39f9..1d6595d 100644
--- a/WinPowerHelper.Wpf/ThemeManager/Theme.cs
+++ b/WinPowerHelper.Wpf/ThemeManager/Theme.cs
@@ -21,7 +21,7 @@ public Theme(ResourceDictionary resources)
         public const string ThemeNameKey = "Theme.Name";
         public const string ThemeDisplayNameKey = "Theme.DisplayName";
         public const string ThemeBaseColorSchemeKey = "Theme.BaseColorScheme";
-        public const string ThemeColorSchemeKey = "Theme.ColorSchema";
+        public const string ThemeColorSchemeKey = "Theme.ColorScheme";
         public const string ThemeShowcaseBrushKey = "Theme.ShowcaseBrush";
 
         public string Name { get; set; }
diff --git a/WinPowerHelper.Wpf/ThemeManager/ThemeManager.cs b/WinPowerHelper.Wpf/ThemeManager/ThemeManager.cs
index d8d4006..61bf9ad 100644
--- a/WinPowerHelper.Wpf/ThemeManager/ThemeManager.cs
+++ b/WinPowerHelper.Wpf/ThemeManager/ThemeManager.cs
@@ -3,8 +3,8 @@
     using System;
     using System.Collections;
     using System.Collections.Generic;
+    using System.Linq;
     using System.Resources;
-    using System.Text;
     using System.Windows;
 
     public static class ThemeManager
@@ -28,11 +28,18 @@ private set
             }
         }
 
+        /// <summary>
+        /// 确保 <see cref="Themes"/> 存在数据
+        /// </summary>
+        /// <note>
+        /// 这个方法中不能调用属性 <see cref="Themes"/>, 否则会造成 "循环引用"
+        /// 这个方法会被一直递归, 直到堆栈溢出
+        /// </note>
         private static void EnsureThemes()
         {
-            if (Themes.Count > 0) return;
+            if (_themes.Count > 0) return;
             var assembly = typeof(ThemeManager).Assembly;
-            var assemblyName = assembly.GetName();
+            var assemblyName = assembly.GetName().Name;
             var resourceNames = assembly.GetManifestResourceNames();
 
             foreach (var resourceName in resourceNames)
@@ -44,13 +51,47 @@ private static void EnsureThemes()
                 {
                     foreach (DictionaryEntry entry in reader)
                     {
-                        throw new NotImplementedException();
+                        string stringKey = entry.Key as string;
+                        if (stringKey == null ||
+                            !stringKey.Contains("/themes/", StringComparison.OrdinalIgnoreCase) ||
+                            !stringKey.EndsWith(".baml", StringComparison.OrdinalIgnoreCase) ||
+                            stringKey.EndsWith("generic.baml", StringComparison.OrdinalIgnoreCase)) continue;
+
+                        var resourceDictionary = new ResourceDictionary()
+                        {
+                            Source = new Uri(
+                                $"pack://application:,,,/{assemblyName};component/{stringKey.Replace("baml", "xaml")}")
+                        };
+
+                        if (resourceDictionary != null && 
+                            resourceDictionary.MergedDictionaries.Count == 0)
+                            _themes.Add(new Theme(resourceDictionary));
+
                     }
                 }
-                
-                
             }
         }
 
+        public static void ChangeThemeColorScheme(ResourceDictionary resources, string newColorScheme)
+        {
+            var oldThemeResource = resources.MergedDictionaries.FirstOrDefault(
+               x => x.Source.LocalPath.Contains(
+                   "light.", StringComparison.OrdinalIgnoreCase));
+
+            if (oldThemeResource[Theme.ThemeColorSchemeKey] as string == newColorScheme) return;
+
+            var newTheme = Themes.FirstOrDefault(x =>
+                x.ColorScheme.Equals(newColorScheme, StringComparison.OrdinalIgnoreCase));
+
+            string assemblyName = typeof(ThemeManager).Assembly.GetName().Name;
+            var newThemeResource = new ResourceDictionary
+            {
+                Source = new Uri(
+                    $"pack://application:,,,/{assemblyName};component/Styles/Themes/Light.{newColorScheme}.xaml")
+            };
+            resources.MergedDictionaries.Add(newThemeResource);
+            if (oldThemeResource != null)
+                resources.MergedDictionaries.Remove(oldThemeResource);
+        }
     }
 }
diff --git a/WinPowerHelper.Wpf/ViewModels/MainViewModel.cs b/WinPowerHelper.Wpf/ViewModels/MainViewModel.cs
index 8663976..8636e6c 100644
--- a/WinPowerHelper.Wpf/ViewModels/MainViewModel.cs
+++ b/WinPowerHelper.Wpf/ViewModels/MainViewModel.cs
@@ -9,6 +9,9 @@
     using WinPowerHelper.Core.Models;
     using WinPowerHelper.Core.Services;
     using WinPowerHelper.Wpf.Views;
+    using ThemeManager;
+    using System.Windows;
+    using System.Linq;
 
     internal class MainViewModel : BindableBase
     {
@@ -24,6 +27,11 @@ public MainViewModel()
                 Core.Models.PowerOptions.Shutdown,
                 Core.Models.PowerOptions.Restart,
             };
+            Themes = ThemeManager.Themes;
+            SelectedTheme =
+                Themes.FirstOrDefault(
+                    x => x.ColorScheme.Contains(
+                        "blue", StringComparison.OrdinalIgnoreCase));
         }
 
         public static string AppTitle => "Windows定时关机助手";
@@ -35,9 +43,21 @@ public TimeSpan Interval
             set => SetProperty(ref _interval, value);
         }
 
+        public IList<Theme> Themes { get; set; }
         public List<PowerOptions> PowerOptions { get; set; }
         public PowerOptions SelectedPowerOption { get; set; }
 
+        private Theme _selectedTheme;
+        public Theme SelectedTheme
+        {
+            get => _selectedTheme;
+            set
+            {
+                SetProperty(ref _selectedTheme, value);
+                ThemeManager.ChangeThemeColorScheme(Application.Current.Resources, value.ColorScheme);
+            }
+        }
+
         public ICommand SetIntervalCmd { get; private set; }
         public ICommand SetIntervalToZeroCmd { get; private set; }
         public ICommand BeginOrStopTimingCmd { get; private set; }
diff --git a/WinPowerHelper.Wpf/Views/WindowTitleBar.xaml b/WinPowerHelper.Wpf/Views/WindowTitleBar.xaml
new file mode 100644
index 0000000..fad78d2
--- /dev/null
+++ b/WinPowerHelper.Wpf/Views/WindowTitleBar.xaml
@@ -0,0 +1,129 @@
+<UserControl x:Class="WinPowerHelper.Wpf.Views.WindowTitleBar"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:theme="clr-namespace:WinPowerHelper.Wpf.ThemeManager"
+
+             mc:Ignorable="d" Foreground="{DynamicResource Brushes.White}"
+             Height="{StaticResource Window.TitleBar.Height}" Width="Auto"
+             d:DesignHeight="28" d:DesignWidth="500" d:DataContext="{StaticResource MainViewModel}">
+    <Border Background="{DynamicResource Brushes.Accent}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition x:Name="WindowCommand" Width="Auto"/>
+            </Grid.ColumnDefinitions>
+            <StackPanel Orientation="Horizontal"
+                        VerticalAlignment="Stretch">
+                <Image Margin="5" 
+                       Source="cb89p-4nv71-003.ico"/>
+                <TextBlock FontSize="{StaticResource FontSize.WindowTitle}" 
+                           VerticalAlignment="Center"
+                           FontWeight="ExtraLight"
+                           Text="{Binding Path=AppTitle, FallbackValue=标题}"/>
+                <ComboBox ItemsSource="{Binding  Path=Themes}"
+                          SelectedItem="{Binding SelectedTheme}"
+                          IsEditable="False"
+                          Style="{StaticResource ComboBox}"
+                          Padding="3 0">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate DataType="{x:Type theme:Theme}">
+                            <Border Padding="3 4">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <Ellipse  VerticalAlignment="Center" 
+                                              StrokeThickness="0"
+                                              Width="14" Height="14"
+                                              Fill="{Binding ShowcaseBrush}" 
+                                              HorizontalAlignment="Stretch"/>
+                                    <TextBlock Grid.Column="1" 
+                                               FontSize="14"
+                                               Text="{Binding ColorScheme}"/>
+                                </Grid>
+                            </Border>
+                            
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+            </StackPanel>
+            <StackPanel Grid.Column="1" 
+                       Orientation="Horizontal"
+                       VerticalAlignment="Stretch">
+                <StackPanel.Resources>
+                    <Style TargetType="{x:Type TextBlock}">
+                        <Setter Property="Foreground" Value="{DynamicResource Brushes.White}"/>
+                        <Setter Property="FontSize" Value="18"/>
+                        <Setter Property="VerticalAlignment" Value="Center"/>
+                    </Style>
+                </StackPanel.Resources>
+                <Border x:Name="Minimize" Background="Transparent" 
+                        Padding="8 0"
+                        MouseLeftButtonDown="Minimize_MouseLeftButtonDown">
+                    <Border.Style>
+                        <Style>
+                            <Style.Triggers>
+                                <Trigger Property="Border.IsMouseOver" Value="True">
+                                    <Trigger.EnterActions>
+                                        <BeginStoryboard>
+                                            <Storyboard>
+                                                <ColorAnimation Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" 
+                                                                Duration="0:0:0.2"
+                                                                To="#CCBBBDBC"/>
+                                            </Storyboard>
+                                        </BeginStoryboard>
+                                    </Trigger.EnterActions>
+                                    <Trigger.ExitActions>
+                                        <BeginStoryboard>
+                                            <Storyboard>
+                                                <ColorAnimation Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" 
+                                                                Duration="0:0:0.2"
+                                                                To="Transparent"/>
+                                            </Storyboard>
+                                        </BeginStoryboard>
+                                    </Trigger.ExitActions>
+                                </Trigger>
+                            </Style.Triggers>
+                        </Style>
+                    </Border.Style>
+                    <TextBlock FontFamily="Marlett" Text="0"/>
+                </Border>
+                <Border x:Name="Close" 
+                        Padding="8 0" 
+                        Background="Transparent"
+                        MouseLeftButtonDown="Close_MouseLeftButtonDown">
+                    <Border.Style>
+                        <Style>
+                            <Style.Triggers>
+                                <Trigger Property="Border.IsMouseOver" Value="True">
+                                    <Trigger.EnterActions>
+                                        <BeginStoryboard>
+                                            <Storyboard SlipBehavior="Slip">
+                                                <ColorAnimation Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" 
+                                                                Duration="0:0:0.2" 
+                                                                To="Red"/>
+                                            </Storyboard>
+                                        </BeginStoryboard>
+                                    </Trigger.EnterActions>
+                                    <Trigger.ExitActions>
+                                        <BeginStoryboard>
+                                            <Storyboard SlipBehavior="Slip">
+                                                <ColorAnimation Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" 
+                                                                Duration="0:0:0.2" 
+                                                                To="Transparent"/>
+                                            </Storyboard>
+                                        </BeginStoryboard>
+                                    </Trigger.ExitActions>
+                                </Trigger>
+                            </Style.Triggers>
+                        </Style>
+                    </Border.Style>
+                    <TextBlock FontFamily="Marlett" Text="r"/>
+                </Border>
+            </StackPanel>
+        </Grid>
+    </Border>
+</UserControl>
diff --git a/WinPowerHelper.Wpf/Views/WindowTitleBar.xaml.cs b/WinPowerHelper.Wpf/Views/WindowTitleBar.xaml.cs
new file mode 100644
index 0000000..6ce311b
--- /dev/null
+++ b/WinPowerHelper.Wpf/Views/WindowTitleBar.xaml.cs
@@ -0,0 +1,36 @@
+namespace WinPowerHelper.Wpf.Views
+{
+    using System.Windows.Controls;
+    using System.Windows.Input;
+    using System.Windows;
+
+    /// <summary>
+    /// Interaction logic for WindowTitleBar.xaml
+    /// </summary>
+    public partial class WindowTitleBar : UserControl
+    {
+        public WindowTitleBar()
+        {
+            InitializeComponent();
+
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+            if (e.LeftButton == MouseButtonState.Pressed)
+                Application.Current.MainWindow.DragMove();
+        }
+
+
+        private void Minimize_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            Application.Current.MainWindow.WindowState = WindowState.Minimized;
+        }
+
+        private void Close_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            Application.Current.MainWindow.Close();
+        }
+    }
+}
diff --git a/WinPowerHelper.Wpf/Views/cb89p-4nv71-003.ico b/WinPowerHelper.Wpf/Views/cb89p-4nv71-003.ico
new file mode 100644
index 0000000000000000000000000000000000000000..8dabfba645cbffb54ca3627e90e532efd6420e05
GIT binary patch
literal 16958
zcmeI1Ux-vy9LKM_(O8kTDi!LQx}i&n`(}vXuB#7*5SVYNlu54Alf6i>?e0rdltvi#
zheX^WF+zOnAO3ksQA!FyeQ<5p2r-GK2q9X$eLk~0?K140KfBkNyLi9LXU^<Bcg{J#
z-#zDdesd-WrtsI+7VtVhXl@UJ2ZJDJ1}+6X;Psr^hKlqx^+4)@)B~vpQV*masEG$2
zpw~IzR$X6{5!9~JDRjL9j>0>j5AGys|33H^et`Kf+0}>vrkoGMT_uds{$2>74;Dfx
zHE_eDun6uhb#s;LwPz!|F<j0l(SN1(>(ABjD!c+SAxYAnH{lmJ4o^U_XH<#(#>Tnu
z9@zdj;9N_Rw5J1pgzL}=#pZM+_TNui&aLm^8oUchjF*owuD9SfI0YLZ17k`1%ZYzJ
z`^Vuh=-02H9qxf7YAu604L8C0x&+3O_V0jF`=7CN8~EG@;AM#NDOELB6C>z?8*mP`
zg0_yOa`K<$eDDbT1&3fIM72j%&E>OM24BKicnKylUg!GP;M(5;#)7148Ur+5?SwTj
z5&IYO`4_>pvIuISIy#*Wb6_@TpVx{>oAVUAubjGa+c74(FSs|F9~9evsV-aE`z(9`
zpTj1Y1xb<qaoxFA+#Agg%#q@nFWSEuPC*u2*SldoJOZ^;1DzWa-51;&uYoy|d7`;;
z9MZQ-!9I?`RdA2@z1NI)Q=!_@zAbPF2H-jvC*5~fgZoQda*pY1=hz;&1b@R7*b5Iq
zHRX7WiQ4Pl=yN{|#$9t|zc0isW1i2s5uE!Ufpef%_PZ~*Hy(j)V4ip%)WhwResFHJ
zfb*eN^MCPh|H~=O6XS~aG?gm#K<a_i19!9sjPdhe;V7DTzX1F$V7{FMx!;-h&j-hs
zAFuDdW}Wv`BJ+z5I02WTZy58P3*dKw6_5mJpT8k^j{Y;`$Lf2pjpz3T?eB(PAuQk@
z{{IP{ge1thcohDG!m)bII`64O+P@CohJ(;M%qNulp$p8nk|5Wqx$r)4e51$eHS4^m
zQt5+YRNCI{yua8utxJ`9AoW1%fjB)dI_AXLZn<sMs(;T`%nSW}%k%xs;Q4ShrR{6L
z{<p#sxEF4x%puLSTEX1t1e}MD!Sjb|O8a+$XR+tNGe4il0?2^%amlvyZ8JO%o;Upt
zp8uI&_P|W2rX15V;O|T~;3jxJ-3k8oJ_CGSamepEtKa|(fVN+R58x@71#$I7Q)SDu
zzGYx8dKx^Fz7EG>BgAzk>)PH9XP_TG1>0W=4Nyz@Y?@##n5(-M`r&nOzQ!T_Z2Qiw
zU9b}DH)-<w$P4fqxHcLgF1g-DQ><Org7LtZIMID!Ds4EA#rLID?ifq8Gm(1ZK@Yeu
zxHmec@yhkRcNpI%T|RGPqWi*maDSeN{q21I7+e8=Ynuy6mND^t_yZjG28goX^=e#M
z0a5X!g}M*H_P&LuA*wy9YN`yqyDwY>_egW3s2HRT?pw|g&(h|=Sn}LrJzN6!x830S
zs)Hm+d)yb?8@2riv_h1;e?Nq90Tw`%^x+=33g&y8U>YPz+OrG#VF1h%joDH1{$9}j
zK3E7*a&5H3F>oDx2D2ea(jN1JGjIT!p$?){iT$=?o@M;|4h};S?KhTfhgIPBg<`72
ze%tYWW9w#k4yHrWWS;1_oUe|zn5;ht&i~6$Z2nW7lkwGcZy&|xR_^A6zi7Yt`VBY%
z^WaXB_OAo?zz!JC`8*$+)Y1oeCbc2y;8PEz9+<oy2*<B%_t0kx%1pL9V?`$0l`HED
z${^dByWTcZPWS$k;b5-p4+mSr@K(mMKD-rBH8{HL4#RAH7zUO!lrQ`JzcnmZHbLXv
zrOJ}+<@?Q-!{edp+&D){TGEaopA6Zz(m`Nni@oISKbh^!`62J8x&r^@{W;?2A%BMj
M&*A_7Z9G!{0X;y9+5i9m

literal 0
HcmV?d00001

diff --git a/WinPowerHelper.Wpf/WinPowerHelper.Wpf.csproj b/WinPowerHelper.Wpf/WinPowerHelper.Wpf.csproj
index 247d9fc..51ad9da 100644
--- a/WinPowerHelper.Wpf/WinPowerHelper.Wpf.csproj
+++ b/WinPowerHelper.Wpf/WinPowerHelper.Wpf.csproj
@@ -17,6 +17,7 @@
 
   <ItemGroup>
     <None Remove="cb89p-4nv71-003.ico" />
+    <None Remove="Views\cb89p-4nv71-003.ico" />
   </ItemGroup>
 
   <ItemGroup>
@@ -29,6 +30,7 @@
 
   <ItemGroup>
     <Resource Include="cb89p-4nv71-003.ico" />
+    <Resource Include="Views\cb89p-4nv71-003.ico" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file