From 758f2d300f531dd53d1944bde7e09dc1cdbdeb76 Mon Sep 17 00:00:00 2001
From: Mahdi Hosseini <mahdidvb72@gmail.com>
Date: Sun, 12 Jan 2020 19:02:04 +0330
Subject: [PATCH 01/41] fix typo

---
 doc/source/handycontrol/extend_controls/timePicker/index.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/source/handycontrol/extend_controls/timePicker/index.md b/doc/source/handycontrol/extend_controls/timePicker/index.md
index 9012c589..5c65e872 100644
--- a/doc/source/handycontrol/extend_controls/timePicker/index.md
+++ b/doc/source/handycontrol/extend_controls/timePicker/index.md
@@ -12,7 +12,7 @@ TimePicker 控件允许用户通过在文本框中键入时间或使用下拉的
 public class TimePicker : Control, IDataInput
 ```
 
-# 创建DatePicker
+# 创建TimePicker
 
 ``` XML
 <hc:TimePicker />
@@ -32,7 +32,7 @@ var timePicker = new TimePicker();
 
 可以通过文本框输入时间，或者点击文本框右边的按钮打开下拉的时钟控件选择时间。
 
-![DatePicker](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/extend_controls/TimePicker_2.png)
+![TimePicker](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/extend_controls/TimePicker_2.png)
 
 也可以在XAML钟或代码中这样设置日期。
 
@@ -56,7 +56,7 @@ timePicker.SelectedTime = DateTime.Now;
 </hc:TimePicker>
 ```
 
-![DatePicker](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/extend_controls/TimePicker_3.png)
+![TimePicker](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/extend_controls/TimePicker_3.png)
 
 # 设置标题和占位符文本
 

From e3177843ca6d77a962b3676d8b51e50e142093cf Mon Sep 17 00:00:00 2001
From: guanguanchuangyu <3246907890@qq.com>
Date: Mon, 13 Jan 2020 21:55:55 +0800
Subject: [PATCH 02/41] add doc of native_radioButton

---
 .../native_controls/radioButton/index.md      | 126 +++++++++++++++++-
 1 file changed, 124 insertions(+), 2 deletions(-)

diff --git a/doc/source/handycontrol/native_controls/radioButton/index.md b/doc/source/handycontrol/native_controls/radioButton/index.md
index ca12ad62..8e2f6a68 100644
--- a/doc/source/handycontrol/native_controls/radioButton/index.md
+++ b/doc/source/handycontrol/native_controls/radioButton/index.md
@@ -1,5 +1,127 @@
 ---
-title: 建设中
+title: RadioButton 单选按钮
 ---
 
-建设中
\ No newline at end of file
+# RadioButtonBaseStyle
+
+`RadioButton`基础样式，不建议直接使用，常作为其他样式基类样式
+
+## 案例：
+
+```xml
+<Style BasedOn="{StaticResource RadioButtonBaseStyle}" TargetType="RadioButton"/>
+```
+
+`xaml`中：
+
+```xml
+<StackPanel>
+    <RadioButton Content="默认样式"/>
+    <RadioButton Margin="0,16,0,0" Content="不可编辑" IsChecked="True" IsEnabled="False"/>
+    <RadioButton Margin="0,16,0,0" Content="默认样式"/>
+    <RadioButton Margin="0,16,0,0" Content="不可编辑" IsEnabled="False"/>
+</StackPanel>
+```
+
+效果：
+
+![RadioButton.DefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RadioButton.DefaultStyle.png)
+
+# RadioButtonIcon:RadioButtonBaseStyle
+
+带图标样式，可只显示图标也可图文显示
+
+## 案例：
+
+```xml
+<UniformGrid Margin="22,0,0,0" Rows="2" Columns="2">
+    <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" Style="{StaticResource RadioButtonIcon}" Content="RadioButtonIcon"/>
+    <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" Style="{StaticResource RadioButtonIcon}" Content="RadioButtonIcon" IsChecked="True"/>
+    <RadioButton Margin="10,0,0,0" BorderThickness="1" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" Style="{StaticResource RadioButtonIcon}" Content="RadioButtonIcon"/>
+    <RadioButton Margin="10,0,0,0" BorderThickness="1" Style="{StaticResource RadioButtonIcon}" Content="RadioButtonIcon"/>
+</UniformGrid>
+```
+
+效果：
+
+![RadioButton.IconStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RadioButton.IconStyle.png)
+
+# RadioGroupItemBaseStyle
+
+`ButtonGroup`控件中的子集`RadioButton`样式基类，不建议直接使用，常作为`ButtonGroup`中`Item`样式基类,同时与`ButtonGroup`控件配套使用
+
+## 案例：
+
+```xml
+<Style x:Key="RadioGroupItemDefault" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton"/>
+```
+
+`xaml`中：
+
+```xml
+<!--内部Item样式为ButtonGroup控件自动附加-默认为水平方向item样式-->
+<hc:ButtonGroup Margin="0,32,0,0">
+    <RadioButton Content="RadioButton" IsChecked="True"/>
+    <RadioButton Content="RadioButton"/>
+    <RadioButton IsEnabled="False" Content="RadioButton"/>
+    <RadioButton Content="RadioButton"/>
+</hc:ButtonGroup>
+<hc:ButtonGroup Margin="0,16,0,0" Style="{StaticResource ButtonGroupSolid}">
+    <RadioButton Content="RadioButton"/>
+    <RadioButton Content="RadioButton"/>
+    <RadioButton IsEnabled="False" Content="RadioButton"/>
+    <RadioButton Content="RadioButton" IsChecked="True"/>
+</hc:ButtonGroup>
+```
+
+效果：
+
+![RadioButton.RadioButtonItemDefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RadioButton.RadioButtonItemDefaultStyle.png)
+
+# RadioGroup关联样式
+
+| 样式Key                       | 用途                                 | 基类样式                |
+| ----------------------------- | ------------------------------------ | ----------------------- |
+| RadioGroupItemDefault         | RadioGroupItem默认样式               | RadioGroupItemBaseStyle |
+| RadioGroupItemHorizontalFirst | RadioGroupItem水平头样式（从左至右） | RadioGroupItemBaseStyle |
+| RadioGroupItemHorizontalLast  | RadioGroupItem水平尾样式（从左至右） | RadioGroupItemBaseStyle |
+| RadioGroupItemSingle          | RadioGroupItem单项样式               | RadioGroupItemBaseStyle |
+| RadioGroupItemVerticalFirst   | RadioGroupItem垂直头样式（从上至下） | RadioGroupItemBaseStyle |
+| RadioGroupItemVerticalLast    | RadioGroupItem垂直尾样式（从上至下） | RadioGroupItemBaseStyle |
+
+## 案例：
+
+单个`RadioButton`样式：
+
+```xml
+<RadioButton Style="{DynamicResource RadioGroupItemSingle}"
+                 Margin="0,16,8,0"
+                 Content="RadioGroupItemSingle"></RadioButton>
+```
+
+效果：
+
+![RadioButton.RadioButtonItemSingleStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RadioButton.RadioButtonItemSingleStyle.png)
+
+多个`RadioButton`垂直样式：
+
+```xml
+<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+    <hc:ButtonGroup Margin="0,16,8,0" Orientation="Vertical">
+        <RadioButton Content="RadioButton" IsChecked="True"/>
+        <RadioButton Content="RadioButton"/>
+        <RadioButton IsEnabled="False" Content="RadioButton"/>
+        <RadioButton Content="RadioButton"/>
+    </hc:ButtonGroup>
+    <hc:ButtonGroup Margin="8,16,0,0" Orientation="Vertical" Style="{StaticResource ButtonGroupSolid}">
+        <RadioButton Content="RadioButton"/>
+        <RadioButton Content="RadioButton"/>
+        <RadioButton IsEnabled="False" Content="RadioButton"/>
+        <RadioButton Content="RadioButton" IsChecked="True"/>
+    </hc:ButtonGroup>
+</StackPanel>
+```
+
+效果：
+
+![RadioButton.RadioButtonItemVerticalStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RadioButton.RadioButtonItemVerticalStyle.png)
\ No newline at end of file

From 27373dba3f7799e6d03139d5b9fb810dfb7886d6 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Mon, 13 Jan 2020 23:36:42 +0800
Subject: [PATCH 03/41] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 1d84448c..23e3584f 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,7 @@
 <a href="https://github.com/towerDLH" target="_blank"><img width="64px" src="https://avatars1.githubusercontent.com/u/53053537?s=400&v=4"></a>
 <a href="https://github.com/BluceBosen" target="_blank"><img width="64px" src="https://avatars3.githubusercontent.com/u/24750822?s=400&v=4"></a>
 <a href="https://github.com/MrZhangYuan" target="_blank"><img width="64px" src="https://avatars2.githubusercontent.com/u/16384123?s=400&v=4"></a>
+<a href="https://github.com/YC946586" target="_blank"><img width="64px" src="https://avatars2.githubusercontent.com/u/49895722?s=400&v=4"></a>
 
 ## Special thanks to
 

From 958cda81a79b376847dd0aa21e2c896217560aad Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 14 Jan 2020 01:25:29 +0800
Subject: [PATCH 04/41] add basic codes

---
 .../UserControl/Controls/PinBoxDemoCtl.xaml   |   6 +-
 .../Controls/Input/PinBox.cs                  | 219 +++++++++++++++++-
 .../Themes/Styles/Base/PinBoxBaseStyle.xaml   |  15 +-
 3 files changed, 236 insertions(+), 4 deletions(-)

diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml
index 77c4a6f4..d5175cbc 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml
@@ -1,7 +1,9 @@
 <UserControl x:Class="HandyControlDemo.UserControl.PinBoxDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:userControl="clr-namespace:HandyControlDemo.UserControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
-    <userControl:UnderConstruction/>
+    <hc:TransitioningContentControl>
+        <hc:PinBox Length="6"/>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs
index 86634976..addf3612 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs
@@ -1,9 +1,226 @@
-using System.Windows.Controls;
+using System;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using HandyControl.Data;
+using HandyControl.Tools;
 
 namespace HandyControl.Controls
 {
+    [TemplatePart(Name = ElementPanel, Type = typeof(Panel))]
     public class PinBox : Control
     {
+        private const string ElementPanel = "PART_Panel";
 
+        private static readonly object MinLength = 4;
+
+        private Panel _panel;
+
+        private int _inputIndex;
+
+        private bool _changed;
+
+        private RoutedEventHandler _passwordBoxsGotFocusEventHandler;
+
+        private RoutedEventHandler _passwordBoxsPasswordChangedEventHandler;
+
+        public PinBox()
+        {
+            Loaded += PinBox_Loaded;
+            Unloaded += PinBox_Unloaded;
+        }
+
+        private void PinBox_Unloaded(object sender, RoutedEventArgs e)
+        {
+            RemoveHandler(System.Windows.Controls.PasswordBox.PasswordChangedEvent, _passwordBoxsPasswordChangedEventHandler);
+            RemoveHandler(GotFocusEvent, _passwordBoxsGotFocusEventHandler);
+            
+            Loaded -= PinBox_Loaded;
+            Unloaded -= PinBox_Unloaded;
+        }
+
+        private void PinBox_Loaded(object sender, RoutedEventArgs e)
+        {
+            _passwordBoxsPasswordChangedEventHandler = PasswordBoxsPasswordChanged;
+            AddHandler(System.Windows.Controls.PasswordBox.PasswordChangedEvent, _passwordBoxsPasswordChangedEventHandler);
+            
+            _passwordBoxsGotFocusEventHandler = PasswordBoxsGotFocus;
+            AddHandler(GotFocusEvent, _passwordBoxsGotFocusEventHandler);
+        }
+
+        private void PasswordBoxsPasswordChanged(object sender, RoutedEventArgs e)
+        {
+            if (e.OriginalSource is System.Windows.Controls.PasswordBox passwordBox)
+            {
+                if (passwordBox.Password.Length > 0)
+                {
+                    if (++_inputIndex >= Length)
+                    {
+                        _inputIndex = Length - 1;
+
+                        if (_panel.Children.OfType<System.Windows.Controls.PasswordBox>()
+                            .All(item => item.Password.Any()))
+                        {
+                            FocusManager.SetFocusedElement(this, null);
+                            Keyboard.ClearFocus();
+                            RaiseEvent(new RoutedEventArgs(CompletedEvent, this));
+                        }
+                        return;
+                    }
+                }
+                else
+                {
+                    if (--_inputIndex < 0)
+                    {
+                        _inputIndex = 0;
+                        return;
+                    }
+                }
+
+                _changed = true;
+                FocusManager.SetFocusedElement(this, _panel.Children[_inputIndex]);
+            }
+        }
+
+        private void PasswordBoxsGotFocus(object sender, RoutedEventArgs e)
+        {
+            if (e.OriginalSource is System.Windows.Controls.PasswordBox passwordBox)
+            {
+                _inputIndex = _panel.Children.IndexOf(passwordBox);
+            }
+        }
+
+        protected override void OnPreviewKeyDown(KeyEventArgs e)
+        {
+            base.OnPreviewKeyUp(e);
+
+            if (e.Key == Key.Left)
+            {
+                if (--_inputIndex < 0)
+                {
+                    _inputIndex = 0;
+                    return;
+                }
+
+                FocusManager.SetFocusedElement(this, _panel.Children[_inputIndex]);
+            }
+            else if (e.Key == Key.Right)
+            {
+                if (++_inputIndex >= Length)
+                {
+                    _inputIndex = Length - 1;
+                    return;
+                }
+
+                FocusManager.SetFocusedElement(this, _panel.Children[_inputIndex]);
+            }
+        }
+
+        protected override void OnPreviewKeyUp(KeyEventArgs e)
+        {
+            base.OnPreviewKeyUp(e);
+
+            if (_changed)
+            {
+                _changed = false;
+                return;
+            }
+
+            if (e.Key == Key.Delete || e.Key == Key.Back)
+            {
+                if (--_inputIndex < 0)
+                {
+                    _inputIndex = 0;
+                    return;
+                }
+
+                FocusManager.SetFocusedElement(this, _panel.Children[_inputIndex]);
+            }
+        }
+
+        public static readonly DependencyProperty LengthProperty = DependencyProperty.Register(
+            "Length", typeof(int), typeof(PinBox), new PropertyMetadata(MinLength, null, CoerceLength), ValidateHelper.IsInRangeOfPosInt);
+
+        private static object CoerceLength(DependencyObject d, object basevalue) => (int)basevalue < 4 ? MinLength : basevalue;
+
+        public int Length
+        {
+            get => (int) GetValue(LengthProperty);
+            set => SetValue(LengthProperty, value);
+        }
+
+        public static readonly DependencyProperty ItemMarginProperty = DependencyProperty.Register(
+            "ItemMargin", typeof(Thickness), typeof(PinBox), new PropertyMetadata(default(Thickness)));
+
+        public Thickness ItemMargin
+        {
+            get => (Thickness) GetValue(ItemMarginProperty);
+            set => SetValue(ItemMarginProperty, value);
+        }
+
+        public static readonly DependencyProperty ItemWidthProperty = DependencyProperty.Register(
+            "ItemWidth", typeof(double), typeof(PinBox), new PropertyMetadata(ValueBoxes.Double0Box));
+
+        public double ItemWidth
+        {
+            get => (double) GetValue(ItemWidthProperty);
+            set => SetValue(ItemWidthProperty, value);
+        }
+
+        public static readonly DependencyProperty ItemHeightProperty = DependencyProperty.Register(
+            "ItemHeight", typeof(double), typeof(PinBox), new PropertyMetadata(ValueBoxes.Double0Box));
+
+        public double ItemHeight
+        {
+            get => (double) GetValue(ItemHeightProperty);
+            set => SetValue(ItemHeightProperty, value);
+        }
+
+        public static readonly RoutedEvent CompletedEvent =
+            EventManager.RegisterRoutedEvent("Completed", RoutingStrategy.Bubble,
+                typeof(EventHandler), typeof(PinBox));
+
+        public event EventHandler Completed
+        {
+            add => AddHandler(CompletedEvent, value);
+            remove => RemoveHandler(CompletedEvent, value);
+        }
+
+        private void UpdateItems()
+        {
+            _panel.Children.Clear();
+            var length = Length;
+
+            for (var i = 0; i < length; i++)
+            {
+                _panel.Children.Add(CreatePasswordBox());
+            }
+        }
+
+        private System.Windows.Controls.PasswordBox CreatePasswordBox()
+        {
+            return new System.Windows.Controls.PasswordBox
+            {
+                MaxLength = 1,
+                HorizontalContentAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+                Margin = ItemMargin,
+                Width = ItemWidth,
+                Height = ItemHeight,
+                Padding = new Thickness()
+            };
+        }
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+
+            _panel = GetTemplateChild(ElementPanel) as Panel;
+            if (_panel != null)
+            {
+                UpdateItems();
+            }
+        }
     }
 }
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/PinBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/PinBoxBaseStyle.xaml
index 98d80b3f..a81214d7 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/PinBoxBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/PinBoxBaseStyle.xaml
@@ -2,8 +2,21 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
-    <Style x:Key="PinBoxBaseStyle" TargetType="controls:PinBox">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Basic/Sizes.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
 
+    <Style x:Key="PinBoxBaseStyle" TargetType="controls:PinBox">
+        <Setter Property="ItemMargin" Value="4,0"/>
+        <Setter Property="ItemWidth" Value="{StaticResource DefaultControlHeight}"/>
+        <Setter Property="ItemHeight" Value="{StaticResource DefaultControlHeight}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:PinBox">
+                    <UniformGrid Name="PART_Panel" Columns="{TemplateBinding Length}" Rows="1"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file

From e2f24256f6aeb875e14e79f4efe0156a5aa36310 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 15 Jan 2020 01:04:56 +0800
Subject: [PATCH 05/41] completed the branch

---
 README.md                                     |   8 +-
 .../Controls/PasswordBoxDemoCtl.xaml          |   3 +-
 .../UserControl/Controls/PinBoxDemoCtl.xaml   |   5 +-
 .../Controls/PinBoxDemoCtl.xaml.cs            |  13 +-
 .../Controls/Input/PasswordBox.cs             |   8 --
 .../Controls/Input/PinBox.cs                  | 125 +++++++++++++++++-
 .../Tools/Extension/EnumerableExtension.cs    |  11 ++
 7 files changed, 153 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 5d441e75..28797228 100644
--- a/README.md
+++ b/README.md
@@ -94,6 +94,10 @@ Step 4：enjoy coding
 
 ## Latest examples
 
+### PinBox
+
+![PinBox](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/PinBox.png)
+
 ### Effects
 
 ![Effects](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Effects.png)
@@ -110,12 +114,12 @@ Step 4：enjoy coding
 
 ![Poptip](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Poptip.gif)
 
+## History publication
+
 ### Divider
 
 ![Divider](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Divider.png)
 
-## History publication
-
 ### GeometryAnimation
 
 ![GeometryAnimation](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/GeometryAnimation.gif)
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PasswordBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PasswordBoxDemoCtl.xaml
index 172bc51d..d6781b14 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PasswordBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PasswordBoxDemoCtl.xaml
@@ -13,8 +13,7 @@
             <hc:PasswordBox ShowEyeButton="True" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
 
             <hc:PasswordBox ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Margin="0,32,0,0" Password="123456"/>
-            <!--<hc:PasswordBox ShowClearButton="True" ShowEyeButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>-->
-
+            <hc:PasswordBox ShowClearButton="True" ShowEyeButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
         </StackPanel>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml
index d5175cbc..728c99a3 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml
@@ -4,6 +4,9 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <hc:PinBox Length="6"/>
+        <StackPanel Margin="32" VerticalAlignment="Center" hc:PinBox.Completed="PinBox_OnCompleted">
+            <hc:PinBox Length="4" Password="1234"/>
+            <hc:PinBox Length="6" Password="123456" Margin="0,16,0,0" PasswordChar="❤"/>
+        </StackPanel>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml.cs
index dc8f65fd..02c0ca3a 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml.cs
@@ -1,4 +1,7 @@
-namespace HandyControlDemo.UserControl
+using System.Windows;
+using HandyControl.Controls;
+
+namespace HandyControlDemo.UserControl
 {
     public partial class PinBoxDemoCtl
     {
@@ -6,5 +9,13 @@
         {
             InitializeComponent();
         }
+
+        private void PinBox_OnCompleted(object sender, RoutedEventArgs e)
+        {
+            if (e.OriginalSource is PinBox pinBox)
+            {
+                Growl.Info(pinBox.Password);
+            }
+        }
     }
 }
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs
index 1c2037aa..5fdd95be 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs
@@ -60,8 +60,6 @@ namespace HandyControl.Controls
 
         private SecureString _password;
 
-        private char _passwordChar;
-
         private System.Windows.Controls.TextBox _textBox;
 
         public PasswordBox()
@@ -223,12 +221,6 @@ namespace HandyControl.Controls
                         }
                     }
                 }
-
-                if (_passwordChar != default(char))
-                {
-                    ActualPasswordBox.PasswordChar = _passwordChar;
-                    _passwordChar = default;
-                }
             }
 
             if (_textBox != null)
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs
index addf3612..89fa3e43 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs
@@ -1,10 +1,14 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.InteropServices;
+using System.Security;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using HandyControl.Data;
 using HandyControl.Tools;
+using HandyControl.Tools.Extension;
 
 namespace HandyControl.Controls
 {
@@ -21,6 +25,10 @@ namespace HandyControl.Controls
 
         private bool _changed;
 
+        private bool _isInternalAction;
+
+        private List<SecureString> _passwordList;
+
         private RoutedEventHandler _passwordBoxsGotFocusEventHandler;
 
         private RoutedEventHandler _passwordBoxsPasswordChangedEventHandler;
@@ -51,6 +59,8 @@ namespace HandyControl.Controls
 
         private void PasswordBoxsPasswordChanged(object sender, RoutedEventArgs e)
         {
+            if (_isInternalAction) return;
+
             if (e.OriginalSource is System.Windows.Controls.PasswordBox passwordBox)
             {
                 if (passwordBox.Password.Length > 0)
@@ -88,6 +98,7 @@ namespace HandyControl.Controls
             if (e.OriginalSource is System.Windows.Controls.PasswordBox passwordBox)
             {
                 _inputIndex = _panel.Children.IndexOf(passwordBox);
+                passwordBox.SelectAll();
             }
         }
 
@@ -103,7 +114,10 @@ namespace HandyControl.Controls
                     return;
                 }
 
-                FocusManager.SetFocusedElement(this, _panel.Children[_inputIndex]);
+                var passwordBox = _panel.Children[_inputIndex] as System.Windows.Controls.PasswordBox;
+                passwordBox?.SelectAll();
+
+                FocusManager.SetFocusedElement(this, passwordBox);
             }
             else if (e.Key == Key.Right)
             {
@@ -113,7 +127,10 @@ namespace HandyControl.Controls
                     return;
                 }
 
-                FocusManager.SetFocusedElement(this, _panel.Children[_inputIndex]);
+                var passwordBox = _panel.Children[_inputIndex] as System.Windows.Controls.PasswordBox;
+                passwordBox?.SelectAll();
+
+                FocusManager.SetFocusedElement(this, passwordBox);
             }
         }
 
@@ -129,6 +146,13 @@ namespace HandyControl.Controls
 
             if (e.Key == Key.Delete || e.Key == Key.Back)
             {
+                if (_panel.Children[_inputIndex] is System.Windows.Controls.PasswordBox passwordBox)
+                {
+                    _isInternalAction = true;
+                    passwordBox.Clear();
+                    _isInternalAction = false;
+                }
+
                 if (--_inputIndex < 0)
                 {
                     _inputIndex = 0;
@@ -139,8 +163,66 @@ namespace HandyControl.Controls
             }
         }
 
+        public string Password
+        {
+            get
+            {
+                return string.Join("", _panel.Children.OfType<System.Windows.Controls.PasswordBox>().Select(item => item.Password));
+            }
+            set
+            {
+                if (_panel == null)
+                {
+                    _passwordList = new List<SecureString>();
+
+                    if (value == null)
+                    {
+                        value = string.Empty;
+                    }
+
+                    foreach (var item in value)
+                    {
+                        var secureString = new SecureString();
+                        secureString.AppendChar(item);
+                        _passwordList.Add(secureString);
+                    }
+
+                    return;
+                }
+
+                var length = Length;
+                if (string.IsNullOrEmpty(value) || value.Length != length || value.Length != _panel.Children.Count)
+                {
+                    _panel.Children.OfType<System.Windows.Controls.PasswordBox>().Do(item => item.Clear());
+                }
+                else
+                {
+                    _panel.Children.OfType<System.Windows.Controls.PasswordBox>().DoWithIndex((item, index) => item.Password = value[index].ToString());
+                }
+            }
+        }
+
+        /// <summary>
+        ///     掩码字符
+        /// </summary>
+        public static readonly DependencyProperty PasswordCharProperty =
+            System.Windows.Controls.PasswordBox.PasswordCharProperty.AddOwner(typeof(PinBox),
+                new FrameworkPropertyMetadata('●'));
+
+        public char PasswordChar
+        {
+            get => (char)GetValue(PasswordCharProperty);
+            set => SetValue(PasswordCharProperty, value);
+        }
+
         public static readonly DependencyProperty LengthProperty = DependencyProperty.Register(
-            "Length", typeof(int), typeof(PinBox), new PropertyMetadata(MinLength, null, CoerceLength), ValidateHelper.IsInRangeOfPosInt);
+            "Length", typeof(int), typeof(PinBox), new PropertyMetadata(MinLength, OnLengthChanged, CoerceLength), ValidateHelper.IsInRangeOfPosInt);
+
+        private static void OnLengthChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctl = (PinBox) d;
+            ctl.UpdateItems();
+        }
 
         private static object CoerceLength(DependencyObject d, object basevalue) => (int)basevalue < 4 ? MinLength : basevalue;
 
@@ -179,9 +261,9 @@ namespace HandyControl.Controls
 
         public static readonly RoutedEvent CompletedEvent =
             EventManager.RegisterRoutedEvent("Completed", RoutingStrategy.Bubble,
-                typeof(EventHandler), typeof(PinBox));
+                typeof(RoutedEventHandler), typeof(PinBox));
 
-        public event EventHandler Completed
+        public event RoutedEventHandler Completed
         {
             add => AddHandler(CompletedEvent, value);
             remove => RemoveHandler(CompletedEvent, value);
@@ -189,6 +271,8 @@ namespace HandyControl.Controls
 
         private void UpdateItems()
         {
+            if (_panel == null) return;
+
             _panel.Children.Clear();
             var length = Length;
 
@@ -208,7 +292,8 @@ namespace HandyControl.Controls
                 Margin = ItemMargin,
                 Width = ItemWidth,
                 Height = ItemHeight,
-                Padding = new Thickness()
+                Padding = default,
+                PasswordChar = PasswordChar
             };
         }
 
@@ -220,6 +305,34 @@ namespace HandyControl.Controls
             if (_panel != null)
             {
                 UpdateItems();
+
+                var length = Length;
+                if (_passwordList != null && _passwordList.Count == length && _panel.Children.Count == length)
+                {
+                    for (var i = 0; i < length; i++)
+                    {
+                        var password = _passwordList[i];
+                        if (password.Length > 0)
+                        {
+                            var valuePtr = IntPtr.Zero;
+                            try
+                            {
+                                valuePtr = Marshal.SecureStringToGlobalAllocUnicode(password);
+                                if (_panel.Children[i] is System.Windows.Controls.PasswordBox passwordBox)
+                                {
+                                    passwordBox.Password = Marshal.PtrToStringUni(valuePtr) ?? throw new InvalidOperationException();
+                                }
+                            }
+                            finally
+                            {
+                                Marshal.ZeroFreeGlobalAllocUnicode(valuePtr);
+                                password.Clear();
+                            }
+                        }
+                    }
+
+                    _passwordList.Clear();
+                }
             }
         }
     }
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/EnumerableExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/EnumerableExtension.cs
index 68232166..3d5685db 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/EnumerableExtension.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/EnumerableExtension.cs
@@ -16,5 +16,16 @@ namespace HandyControl.Tools.Extension
 
             return enumerable;
         }
+
+        public static IEnumerable<TSource> DoWithIndex<TSource>(this IEnumerable<TSource> source, Action<TSource, int> predicate)
+        {
+            var enumerable = source as IList<TSource> ?? source.ToList();
+            for (var i = 0; i < enumerable.Count; i++)
+            {
+                predicate.Invoke(enumerable[i], i);
+            }
+
+            return enumerable;
+        }
     }
 }
\ No newline at end of file

From 952cf564d0908d75af606b0b94417f3329a04d20 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 15 Jan 2020 01:09:09 +0800
Subject: [PATCH 06/41] Update index.md

---
 doc/source/handycontrol/tnx/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/source/handycontrol/tnx/index.md b/doc/source/handycontrol/tnx/index.md
index 7e1b38aa..565cb3ca 100644
--- a/doc/source/handycontrol/tnx/index.md
+++ b/doc/source/handycontrol/tnx/index.md
@@ -12,4 +12,4 @@ title: 鸣谢
 
 # 感谢以下捐赠者
 
-<p><a style="border:0" href="https://github.com/bigorange1900" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars1.githubusercontent.com/u/49062011?s=400&v=4" alt="bigorange1900"></a><a style="border:0" href="https://github.com/14632791" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars3.githubusercontent.com/u/27358331?s=400&v=4" alt="14632791"></a><a style="border:0" href="https://github.com/IUpdatable" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars2.githubusercontent.com/u/51181716?s=400&v=4" alt="IUpdatable"></a><a style="border:0" href="https://github.com/maplewei" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars1.githubusercontent.com/u/13778095?s=400&v=4" alt="maplewei"></a><a style="border:0" href="https://github.com/sunshang-hl" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars1.githubusercontent.com/u/34593206?s=400&v=4" alt="sunshang-hl"></a><a style="border:0" href="https://github.com/yangkang326" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars1.githubusercontent.com/u/51224259?s=400&v=4" alt="yangkang326"></a><a style="border:0" href="https://github.com/zmrbak" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars3.githubusercontent.com/u/7257543?s=400&v=4" alt="zmrbak"></a><a style="border:0" href="https://github.com/AFei19911012" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars0.githubusercontent.com/u/31465314?s=400&v=4" alt="AFei19911012"></a><a style="border:0" href="https://github.com/wayne2006" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars0.githubusercontent.com/u/21210915?s=400&v=4" alt="wayne2006"></a><a style="border:0" href="https://github.com/towerDLH" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars1.githubusercontent.com/u/53053537?s=400&v=4" alt="towerDLH"></a><a style="border:0" href="https://github.com/BluceBosen" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars3.githubusercontent.com/u/24750822?s=400&v=4" alt="BluceBosen"></a><a style="border:0" href="https://github.com/MrZhangYuan" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars2.githubusercontent.com/u/16384123?s=400&v=4" alt="MrZhangYuan"></a></p>
\ No newline at end of file
+<p><a style="border:0" href="https://github.com/bigorange1900" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars1.githubusercontent.com/u/49062011?s=400&v=4" alt="bigorange1900"></a><a style="border:0" href="https://github.com/14632791" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars3.githubusercontent.com/u/27358331?s=400&v=4" alt="14632791"></a><a style="border:0" href="https://github.com/IUpdatable" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars2.githubusercontent.com/u/51181716?s=400&v=4" alt="IUpdatable"></a><a style="border:0" href="https://github.com/maplewei" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars1.githubusercontent.com/u/13778095?s=400&v=4" alt="maplewei"></a><a style="border:0" href="https://github.com/sunshang-hl" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars1.githubusercontent.com/u/34593206?s=400&v=4" alt="sunshang-hl"></a><a style="border:0" href="https://github.com/yangkang326" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars1.githubusercontent.com/u/51224259?s=400&v=4" alt="yangkang326"></a><a style="border:0" href="https://github.com/zmrbak" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars3.githubusercontent.com/u/7257543?s=400&v=4" alt="zmrbak"></a><a style="border:0" href="https://github.com/AFei19911012" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars0.githubusercontent.com/u/31465314?s=400&v=4" alt="AFei19911012"></a><a style="border:0" href="https://github.com/wayne2006" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars0.githubusercontent.com/u/21210915?s=400&v=4" alt="wayne2006"></a><a style="border:0" href="https://github.com/towerDLH" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars1.githubusercontent.com/u/53053537?s=400&v=4" alt="towerDLH"></a><a style="border:0" href="https://github.com/BluceBosen" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars3.githubusercontent.com/u/24750822?s=400&v=4" alt="BluceBosen"></a><a style="border:0" href="https://github.com/MrZhangYuan" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars2.githubusercontent.com/u/16384123?s=400&v=4" alt="MrZhangYuan"></a><a style="border:0" href="https://github.com/YC946586" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars2.githubusercontent.com/u/49895722?s=400&v=4" alt="YC946586"></a></p>
\ No newline at end of file

From 0ab014f81dc1aa897a1f7a0ee66ce6bd29c57b47 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 15 Jan 2020 22:25:07 +0800
Subject: [PATCH 07/41] add some styles

add Separator and StatusBar style
---
 .../HandyControl_Shared.projitems                | 16 ++++++++++++++++
 .../Themes/Styles/Base/SeparatorBaseStyle.xaml   |  8 ++++++++
 .../Themes/Styles/Base/StatusBarBaseStyle.xaml   | 16 ++++++++++++++++
 .../Themes/Styles/Separator.xaml                 |  9 +++++++++
 .../Themes/Styles/StatusBar.xaml                 |  9 +++++++++
 .../HandyControl_Shared/Themes/Styles/Style.xaml |  2 ++
 6 files changed, 60 insertions(+)
 create mode 100644 src/Shared/HandyControl_Shared/Themes/Styles/Base/SeparatorBaseStyle.xaml
 create mode 100644 src/Shared/HandyControl_Shared/Themes/Styles/Base/StatusBarBaseStyle.xaml
 create mode 100644 src/Shared/HandyControl_Shared/Themes/Styles/Separator.xaml
 create mode 100644 src/Shared/HandyControl_Shared/Themes/Styles/StatusBar.xaml

diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index 32cab771..95008f3d 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -394,6 +394,22 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\StatusBar.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\Separator.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\Base\SeparatorBaseStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\Base\StatusBarBaseStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\PinBox.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/SeparatorBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/SeparatorBaseStyle.xaml
new file mode 100644
index 00000000..2b9f91b0
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/SeparatorBaseStyle.xaml
@@ -0,0 +1,8 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="SeparatorBaseStyle" TargetType="Separator">
+        <Setter Property="Background" Value="{DynamicResource BorderBrush}"/>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/StatusBarBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/StatusBarBaseStyle.xaml
new file mode 100644
index 00000000..1da267ba
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/StatusBarBaseStyle.xaml
@@ -0,0 +1,16 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="SeparatorBaseStyle.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style x:Key="{x:Static StatusBar.SeparatorStyleKey}" BasedOn="{StaticResource SeparatorBaseStyle}" TargetType="Separator"/>
+
+    <Style x:Key="StatusBarBaseStyle" TargetType="StatusBar">
+        <Setter Property="BorderThickness" Value="0,1,0,0"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Separator.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Separator.xaml
new file mode 100644
index 00000000..f50f2ab3
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Separator.xaml
@@ -0,0 +1,9 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Base/SeparatorBaseStyle.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style BasedOn="{StaticResource SeparatorBaseStyle}" TargetType="Separator"/>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/StatusBar.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/StatusBar.xaml
new file mode 100644
index 00000000..9f2a27b3
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/StatusBar.xaml
@@ -0,0 +1,9 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Base/StatusBarBaseStyle.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style BasedOn="{StaticResource StatusBarBaseStyle}" TargetType="StatusBar"/>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml
index 308b65d4..063d9132 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml
@@ -79,6 +79,8 @@
         <ResourceDictionary Source="Poptip.xaml"/>
         <ResourceDictionary Source="Drawer.xaml"/>
         <ResourceDictionary Source="PinBox.xaml"/>
+        <ResourceDictionary Source="Separator.xaml"/>
+        <ResourceDictionary Source="StatusBar.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>
\ No newline at end of file

From 8a6fc358738dfbc58a2195171d2ca2213912ecf8 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 15 Jan 2020 22:32:14 +0800
Subject: [PATCH 08/41] Update TransitioningContentControl.xaml

---
 .../Themes/Styles/TransitioningContentControl.xaml         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/TransitioningContentControl.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/TransitioningContentControl.xaml
index 8d7d7d4a..b9b21f96 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/TransitioningContentControl.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/TransitioningContentControl.xaml
@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:HandyControl.Controls">
 
     <Storyboard x:Key="Right2LeftTransition" x:Shared="False">
         <DoubleAnimation From="50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
@@ -73,4 +74,8 @@
         <DoubleAnimation From="0" To="1" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.Opacity)"/>
     </Storyboard>
 
+    <Style TargetType="controls:TransitioningContentControl">
+        <Setter Property="Focusable" Value="False"/>
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file

From 02e8fc4a1361216303f06862f7df421e2e2dd51a Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 16 Jan 2020 23:49:02 +0800
Subject: [PATCH 09/41] add FlowDocumentScrollViewer style

---
 README.md                                     |   8 +-
 .../HandyControlDemo_Core30.csproj            |   3 +
 .../HandyControlDemo_Net_40.csproj            |   3 +
 .../HandyControlDemo_Net_GE45.csproj          |   3 +
 .../Data/DemoInfo.json                        |   1 +
 .../HandyControlDemo_Shared.projitems         |   7 ++
 .../Properties/Langs/Lang.Designer.cs         |   9 ++
 .../Properties/Langs/Lang.en.resx             |   3 +
 .../Properties/Langs/Lang.fa.resx             |   3 +
 .../Properties/Langs/Lang.fr.resx             |   3 +
 .../Properties/Langs/Lang.ko-KR.resx          |   3 +
 .../Properties/Langs/Lang.resx                |   3 +
 .../LeftMainContent/WPFFlowDocument_16x.png   | Bin 0 -> 315 bytes
 .../Controls/RangeSliderDemoCtl.xaml          |   8 +-
 .../FlowDocumentScrollViewerDemoCtl.xaml      | 101 ++++++++++++++++++
 .../FlowDocumentScrollViewerDemoCtl.xaml.cs   |  10 ++
 .../UserControl/Styles/SliderDemoCtl.xaml     |   8 +-
 .../Controls/Attach/TipElement.cs             |   9 ++
 .../HandyControl_Shared.projitems             |   4 +
 .../Properties/Langs/Lang.Designer.cs         |  18 ++++
 .../Properties/Langs/Lang.en.resx             |   6 ++
 .../Properties/Langs/Lang.fa.resx             |   6 ++
 .../Properties/Langs/Lang.fr.resx             |   6 ++
 .../Properties/Langs/Lang.ko-KR.resx          |   6 ++
 .../Properties/Langs/Lang.resx                |   6 ++
 .../Themes/Styles/Base/SliderBaseStyle.xaml   |  32 +++---
 .../Styles/FlowDocumentScrollViewer.xaml      |  55 ++++++++++
 .../Themes/Styles/Style.xaml                  |   1 +
 28 files changed, 299 insertions(+), 26 deletions(-)
 create mode 100644 src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/WPFFlowDocument_16x.png
 create mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentScrollViewerDemoCtl.xaml
 create mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentScrollViewerDemoCtl.xaml.cs
 create mode 100644 src/Shared/HandyControl_Shared/Themes/Styles/FlowDocumentScrollViewer.xaml

diff --git a/README.md b/README.md
index 15c92ccd..f2aeea26 100644
--- a/README.md
+++ b/README.md
@@ -97,6 +97,10 @@ Step 4：enjoy coding
 
 ## Latest examples
 
+### FlowDocumentScrollViewerStyle
+
+![FlowDocumentScrollViewerStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/FlowDocumentScrollViewer.png)
+
 ### PinBox
 
 ![PinBox](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/PinBox.png)
@@ -113,12 +117,12 @@ Step 4：enjoy coding
 
 ![Drawer](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Drawer.gif)
 
+## History publication
+
 ### Poptip
 
 ![Poptip](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Poptip.gif)
 
-## History publication
-
 ### Divider
 
 ![Divider](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Divider.png)
diff --git a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj
index b3c41945..f91f3b1d 100644
--- a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj
+++ b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj
@@ -457,6 +457,9 @@
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Ellipsis_16x.png">
       <Link>Resources\Img\LeftMainContent\Ellipsis_16x.png</Link>
     </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\WPFFlowDocument_16x.png">
+      <Link>Resources\Img\LeftMainContent\WPFFlowDocument_16x.png</Link>
+    </Resource>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\..\Shared\HandyControlDemo_Shared\Properties\Langs\Lang.en.resx">
diff --git a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
index d2ee3658..bba16269 100644
--- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
+++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
@@ -523,6 +523,9 @@
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Ellipsis_16x.png">
       <Link>Resources\Img\LeftMainContent\Ellipsis_16x.png</Link>
     </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\WPFFlowDocument_16x.png">
+      <Link>Resources\Img\LeftMainContent\WPFFlowDocument_16x.png</Link>
+    </Resource>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Data\DemoInfo.json">
diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
index 9b86a79e..94a32b27 100644
--- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
@@ -586,6 +586,9 @@
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Ellipsis_16x.png">
       <Link>Resources\Img\LeftMainContent\Ellipsis_16x.png</Link>
     </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\WPFFlowDocument_16x.png">
+      <Link>Resources\Img\LeftMainContent\WPFFlowDocument_16x.png</Link>
+    </Resource>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\fabric-icons.ttf">
diff --git a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json
index e10713f7..09201d74 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json
+++ b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json
@@ -26,6 +26,7 @@
       [ "GroupBox", "GroupBoxDemoCtl", "GroupBox_16x", "" ],
       [ "Menu", "MenuDemoCtl", "ContextMenu_16x", "" ],
       [ "RichTextBox", "RichTextBoxDemoCtl", "RichTextBox_16x", "" ],
+      [ "FlowDocumentScrollViewer", "FlowDocumentScrollViewerDemoCtl", "WPFFlowDocument_16x", "1" ],
       [ "ToolBar", "ToolBarDemoCtl", "ToolBar_16x", "" ],
       [ "Border", "BorderDemoCtl", "BorderElement_16x", "" ],
       [ "Label", "LabelDemoCtl", "Label_16x", "" ]
diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
index e9b3c59e..17fed60e 100644
--- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
+++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
@@ -293,6 +293,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\ExpanderDemoCtl.xaml.cs">
       <DependentUpon>ExpanderDemoCtl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\FlowDocumentScrollViewerDemoCtl.xaml.cs">
+      <DependentUpon>FlowDocumentScrollViewerDemoCtl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\GroupBoxDemoCtl.xaml.cs">
       <DependentUpon>GroupBoxDemoCtl.xaml</DependentUpon>
     </Compile>
@@ -800,6 +803,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Styles\FlowDocumentScrollViewerDemoCtl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)UserControl\Styles\GroupBoxDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
index 7c2eff9a..0a7a2898 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
@@ -627,6 +627,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 流文档滚动视图 的本地化字符串。
+        /// </summary>
+        public static string FlowDocumentScrollViewer {
+            get {
+                return ResourceManager.GetString("FlowDocumentScrollViewer", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Gif图片 的本地化字符串。
         /// </summary>
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
index 82034ede..eec92d63 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
@@ -714,4 +714,7 @@
   <data name="PinBox" xml:space="preserve">
     <value>PinBox</value>
   </data>
+  <data name="FlowDocumentScrollViewer" xml:space="preserve">
+    <value>FlowDocumentScrollViewer</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx
index d6102272..17f72064 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx
@@ -714,4 +714,7 @@
   <data name="PinBox" xml:space="preserve">
     <value>PinBox</value>
   </data>
+  <data name="FlowDocumentScrollViewer" xml:space="preserve">
+    <value>FlowDocumentScrollViewer</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx
index 95a79a20..2a9f70e6 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx
@@ -714,4 +714,7 @@
   <data name="PinBox" xml:space="preserve">
     <value>PinBox</value>
   </data>
+  <data name="FlowDocumentScrollViewer" xml:space="preserve">
+    <value>FlowDocumentScrollViewer</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx
index 6c0bf75a..b16ff604 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx
@@ -714,4 +714,7 @@
   <data name="PinBox" xml:space="preserve">
     <value>PinBox</value>
   </data>
+  <data name="FlowDocumentScrollViewer" xml:space="preserve">
+    <value>FlowDocumentScrollViewer</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
index e5d2b80e..45a4e46c 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
@@ -714,4 +714,7 @@
   <data name="PinBox" xml:space="preserve">
     <value>PIN码框</value>
   </data>
+  <data name="FlowDocumentScrollViewer" xml:space="preserve">
+    <value>流文档滚动视图</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/WPFFlowDocument_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/WPFFlowDocument_16x.png
new file mode 100644
index 0000000000000000000000000000000000000000..605a4f49da56b69d077f1791232d5920b8b2ece6
GIT binary patch
literal 315
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5M?jcysy3fAQ1Gp%
zi(^Pd+|uCPyv+t8TY9Bq44vE(SgTy7qzKMnF+0KHDdnZ&#-W|Utfgi5(bGbyvMi?H
z(qvuxyL+uqKRdl?gYAPfW1eRJm6xY#EUhv*ldw^BN#?6Ht5zlXW_(?6c$)G}{&(Bi
zC2RN1iMVWX<5=Z9`>h^K?nfHg1sW%F_?1lLNYOf_wn*@%@&yZ(X@XxZ6<EYu+TVx@
z{(p0sL!_wI#qip$b)5p|o@J&zwzw&~=80H8YrysE;fyy8lY`jKaVWUE1{#Q8DDLFg
zCM@7la&DiFw>qQkomLK(uwT+=ZD)w5IrcjyN|a?3oU`Bmk$2|2oY_T__lE;L&fw|l
K=d#Wzp$Py$p>)~+

literal 0
HcmV?d00001

diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RangeSliderDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RangeSliderDemoCtl.xaml
index 0dd0f1b7..8f4f3b99 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RangeSliderDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RangeSliderDemoCtl.xaml
@@ -8,14 +8,14 @@
             <StackPanel>
                 <hc:RangeSlider Width="400" IsSnapToTickEnabled="True" ValueStart="2" ValueEnd="8"/>
                 <hc:RangeSlider Width="400" IsSnapToTickEnabled="True" ValueEnd="3" Margin="0,32,0,0" IsEnabled="False"/>
-                <hc:RangeSlider Width="400" hc:TipElement.Visibility="Visible" IsSnapToTickEnabled="True" Maximum="100" ValueEnd="60" TickFrequency="10" TickPlacement="BottomRight" Margin="0,32,0,0"/>
-                <hc:RangeSlider Width="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="BottomRight" IsSnapToTickEnabled="True" ValueEnd="5" TickPlacement="Both" Margin="0,32,0,0"/>
+                <hc:RangeSlider Width="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" IsSnapToTickEnabled="True" Maximum="100" ValueEnd="60" TickFrequency="10" TickPlacement="BottomRight" Margin="0,32,0,0"/>
+                <hc:RangeSlider Width="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Bottom" hc:TipElement.StringFormat="#0.00" ValueEnd="5" TickPlacement="Both" Margin="0,32,0,0"/>
             </StackPanel>
             <StackPanel Margin="32,0,0,0" Orientation="Horizontal">
                 <hc:RangeSlider Height="400" IsSnapToTickEnabled="True" ValueEnd="8" Orientation="Vertical"/>
                 <hc:RangeSlider Height="400" IsSnapToTickEnabled="True" ValueEnd="3" Margin="32,0,0,0" IsEnabled="False" Orientation="Vertical"/>
-                <hc:RangeSlider Height="400" hc:TipElement.Visibility="Visible" IsSnapToTickEnabled="True" Maximum="100" ValueEnd="60" TickFrequency="10" TickPlacement="BottomRight" Margin="32,0,0,0" Orientation="Vertical"/>
-                <hc:RangeSlider Height="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="BottomRight" IsSnapToTickEnabled="True" ValueEnd="5" TickPlacement="Both" Margin="32,0" Orientation="Vertical"/>
+                <hc:RangeSlider Height="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Left" IsSnapToTickEnabled="True" Maximum="100" ValueEnd="60" TickFrequency="10" TickPlacement="BottomRight" Margin="32,0,0,0" Orientation="Vertical"/>
+                <hc:RangeSlider Height="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Right" hc:TipElement.StringFormat="#0.00" ValueEnd="5" TickPlacement="Both" Margin="32,0" Orientation="Vertical"/>
             </StackPanel>
         </StackPanel>
     </hc:TransitioningContentControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentScrollViewerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentScrollViewerDemoCtl.xaml
new file mode 100644
index 00000000..f6c8c9c3
--- /dev/null
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentScrollViewerDemoCtl.xaml
@@ -0,0 +1,101 @@
+<UserControl x:Class="HandyControlDemo.UserControl.FlowDocumentScrollViewerDemoCtl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
+             Background="{DynamicResource RegionBrush}">
+    <hc:TransitioningContentControl>
+        <FlowDocumentScrollViewer IsToolBarVisible="True" Width="502" Height="400" Margin="32">
+            <FlowDocument ColumnWidth="400" IsOptimalParagraphEnabled="True" IsHyphenationEnabled="True">
+                <Section FontSize="12">
+                    <Paragraph>
+                        <Bold>Neptune</Bold> (planet), major planet in the solar system, eighth planet
+                        from the Sun and fourth largest in diameter.  Neptune maintains an almost constant
+                        distance, about 4,490 million km (about 2,790 million mi), from the Sun.  Neptune
+                        revolves outside the orbit of Uranus and for most of its orbit moves inside the
+                        elliptical path of the outermost planet Pluto (see Solar System). Every 248 years,
+                        Pluto’s elliptical orbit brings the planet inside Neptune’s nearly circular orbit
+                        for about 20 years, temporarily making Neptune the farthest planet from the Sun.
+                        The last time Pluto’s orbit brought it inside Neptune’s orbit was in 1979. In
+                        1999 Pluto’s orbit carried it back outside Neptune’s orbit.
+                        <Figure Width="140" Height="50" Background="GhostWhite" HorizontalAnchor="PageLeft" HorizontalOffset="100" VerticalOffset="20">
+                            <Paragraph FontStyle="Italic" TextAlignment="Left" Background="Beige" Foreground="DarkGreen">
+                                Neptune has 72 times Earth's volume...
+                            </Paragraph>
+                        </Figure>
+                        <Floater Background="GhostWhite" Width="285" HorizontalAlignment="Left">
+                            <Table CellSpacing="5">
+                                <Table.Columns>
+                                    <TableColumn Width="155"/>
+                                    <TableColumn Width="130"/>
+                                </Table.Columns>
+                                <TableRowGroup>
+                                    <TableRow>
+                                        <TableCell ColumnSpan="3">
+                                            <Paragraph>Neptune Stats</Paragraph>
+                                        </TableCell>
+                                    </TableRow>
+                                    <TableRow Background="LightGoldenrodYellow" FontSize="12">
+                                        <TableCell>
+                                            <Paragraph FontWeight="Bold">Mean Distance from Sun</Paragraph>
+                                        </TableCell>
+                                        <TableCell>
+                                            <Paragraph>4,504,000,000 km</Paragraph>
+                                        </TableCell>
+                                    </TableRow>
+                                    <TableRow FontSize="12" Background="LightGray">
+                                        <TableCell>
+                                            <Paragraph FontWeight="Bold">Mean Diameter</Paragraph>
+                                        </TableCell>
+                                        <TableCell>
+                                            <Paragraph>49,532 km</Paragraph>
+                                        </TableCell>
+                                    </TableRow>
+                                    <TableRow Background="LightGoldenrodYellow" FontSize="12">
+                                        <TableCell>
+                                            <Paragraph FontWeight="Bold">Approximate Mass</Paragraph>
+                                        </TableCell>
+                                        <TableCell>
+                                            <Paragraph>1.0247e26 kg</Paragraph>
+                                        </TableCell>
+                                    </TableRow>
+                                    <TableRow>
+                                        <TableCell ColumnSpan="4">
+                                            <Paragraph FontSize="10" FontStyle="Italic">
+                                                Information from the
+                                                <Hyperlink NavigateUri="http://encarta.msn.com/encnet/refpages/artcenter.aspx">Encarta</Hyperlink>
+                                                web site.
+                                            </Paragraph>
+                                        </TableCell>
+                                    </TableRow>
+                                </TableRowGroup>
+                            </Table>
+                        </Floater>
+                    </Paragraph>
+                    <Paragraph>
+                        Astronomers believe Neptune has an inner rocky core that is surrounded by a vast
+                        ocean of water mixed with rocky material. From the inner core, this ocean extends
+                        upward until it meets a gaseous atmosphere of hydrogen, helium, and trace amounts
+                        of methane. Neptune has four rings and 11 known moons. Even though Neptune's volume
+                        is 72 times Earth’s volume, its mass is only 17.15 times Earth’s mass. Because of
+                        its size, scientists classify Neptune—along with Jupiter, Saturn, and Uranus—as
+                        one of the giant or Jovian planets (so-called because they resemble Jupiter).
+                    </Paragraph>
+                    <Paragraph>
+                        <Figure Width="140" Height="50" Background="GhostWhite" TextAlignment="Left" HorizontalAnchor="PageCenter" WrapDirection="Both">
+                            <Paragraph FontStyle="Italic" Background="Beige" Foreground="DarkGreen" >
+                                Neptune has an orbital period of ~20 years...
+                            </Paragraph>
+                        </Figure>
+                        Mathematical theories of astronomy led to the discovery of Neptune. To account for
+                        wobbles in the orbit of the planet Uranus, British astronomer John Couch Adams and
+                        French astronomer Urbain Jean Joseph Leverrier independently calculated the existence
+                        and position of a new planet in 1845 and 1846, respectively. They theorized that the
+                        gravitational attraction of this planet for Uranus was causing the wobbles in Uranus’s
+                        orbit. Using information from Leverrier, German astronomer Johann Gottfried Galle first
+                        observed the planet in 1846.
+                    </Paragraph>
+                </Section>
+            </FlowDocument>
+        </FlowDocumentScrollViewer>
+    </hc:TransitioningContentControl>
+</UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentScrollViewerDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentScrollViewerDemoCtl.xaml.cs
new file mode 100644
index 00000000..0ebfaccf
--- /dev/null
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentScrollViewerDemoCtl.xaml.cs
@@ -0,0 +1,10 @@
+namespace HandyControlDemo.UserControl
+{
+    public partial class FlowDocumentScrollViewerDemoCtl
+    {
+        public FlowDocumentScrollViewerDemoCtl()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml
index 06347065..1094c1f5 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml
@@ -9,15 +9,15 @@
                 <Slider Width="400" IsSnapToTickEnabled="True" Value="8"/>
                 <Slider Width="400" IsSnapToTickEnabled="True" Value="3" Margin="0,32,0,0" IsEnabled="False"/>
                 <Slider Width="400" IsSnapToTickEnabled="True" TickFrequency="5" Maximum="100" TickPlacement="TopLeft" Value="10" IsSelectionRangeEnabled="True" SelectionStart="10" SelectionEnd="80" Margin="0,32,0,0"/>
-                <Slider Width="400" hc:TipElement.Visibility="Visible" IsSnapToTickEnabled="True" Maximum="100" Value="60" TickFrequency="10" TickPlacement="BottomRight" Margin="0,32,0,0"/>
-                <Slider Width="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="BottomRight" IsSnapToTickEnabled="True" Value="5" TickPlacement="Both" Margin="0,32,0,0"/>
+                <Slider Width="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" IsSnapToTickEnabled="True" Maximum="100" Value="60" TickFrequency="10" TickPlacement="BottomRight" Margin="0,32,0,0"/>
+                <Slider Width="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Bottom" hc:TipElement.StringFormat="#0.00" Value="5" TickPlacement="Both" Margin="0,32,0,0"/>
             </StackPanel>
             <StackPanel Margin="32,0,0,0" Orientation="Horizontal">
                 <Slider Height="400" IsSnapToTickEnabled="True" Value="8" Orientation="Vertical"/>
                 <Slider Height="400" IsSnapToTickEnabled="True" Value="3" Margin="32,0,0,0" IsEnabled="False" Orientation="Vertical"/>
                 <Slider Height="400" IsSnapToTickEnabled="True" TickFrequency="5" Maximum="100" TickPlacement="TopLeft" Value="10" IsSelectionRangeEnabled="True" SelectionStart="20" SelectionEnd="80" Margin="32,0,0,0" Orientation="Vertical"/>
-                <Slider Height="400" hc:TipElement.Visibility="Visible" IsSnapToTickEnabled="True" Maximum="100" Value="60" TickFrequency="10" TickPlacement="BottomRight" Margin="32,0,0,0" Orientation="Vertical"/>
-                <Slider Height="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="BottomRight" IsSnapToTickEnabled="True" Value="5" TickPlacement="Both" Margin="32,0" Orientation="Vertical"/>
+                <Slider Height="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Left" IsSnapToTickEnabled="True" Maximum="100" Value="60" TickFrequency="10" TickPlacement="BottomRight" Margin="32,0,0,0" Orientation="Vertical"/>
+                <Slider Height="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Right" hc:TipElement.StringFormat="#0.00" Value="5" TickPlacement="Both" Margin="32,0" Orientation="Vertical"/>
             </StackPanel>
         </StackPanel>
     </hc:TransitioningContentControl>
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/TipElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/TipElement.cs
index 5fa5481f..86777414 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/TipElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/TipElement.cs
@@ -18,5 +18,14 @@ namespace HandyControl.Controls
         public static void SetPlacement(DependencyObject element, TipPlacement value) => element.SetValue(PlacementProperty, value);
 
         public static TipPlacement GetPlacement(DependencyObject element) => (TipPlacement) element.GetValue(PlacementProperty);
+
+        public static readonly DependencyProperty StringFormatProperty = DependencyProperty.RegisterAttached(
+            "StringFormat", typeof(string), typeof(TipElement), new PropertyMetadata("#0.0"));
+
+        public static void SetStringFormat(DependencyObject element, string value)
+            => element.SetValue(StringFormatProperty, value);
+
+        public static string GetStringFormat(DependencyObject element)
+            => (string) element.GetValue(StringFormatProperty);
     }
 }
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index 95008f3d..cb8ba292 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -394,6 +394,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\FlowDocumentScrollViewer.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\StatusBar.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.Designer.cs
index d9db4d8d..cc31cac1 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.Designer.cs
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.Designer.cs
@@ -320,5 +320,23 @@ namespace HandyControl.Properties.Langs {
                 return ResourceManager.GetString("Yes", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   查找类似 放大 的本地化字符串。
+        /// </summary>
+        public static string ZoomIn {
+            get {
+                return ResourceManager.GetString("ZoomIn", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 缩小 的本地化字符串。
+        /// </summary>
+        public static string ZoomOut {
+            get {
+                return ResourceManager.GetString("ZoomOut", resourceCulture);
+            }
+        }
     }
 }
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.resx
index 28b6a0dc..4992c864 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.resx
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.resx
@@ -184,4 +184,10 @@
   <data name="No" xml:space="preserve">
     <value>No</value>
   </data>
+  <data name="ZoomIn" xml:space="preserve">
+    <value>Zoom in</value>
+  </data>
+  <data name="ZoomOut" xml:space="preserve">
+    <value>Zoom out</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fa.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fa.resx
index 58de5d70..166a0b08 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fa.resx
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fa.resx
@@ -184,4 +184,10 @@
   <data name="No" xml:space="preserve">
     <value>خیر</value>
   </data>
+  <data name="ZoomIn" xml:space="preserve">
+    <value>Zoom in</value>
+  </data>
+  <data name="ZoomOut" xml:space="preserve">
+    <value>Zoom out</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fr.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fr.resx
index f616fa21..c400a1f2 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fr.resx
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fr.resx
@@ -204,4 +204,10 @@
   <data name="No" xml:space="preserve">
     <value>Non</value>
   </data>
+  <data name="ZoomIn" xml:space="preserve">
+    <value>Zoom in</value>
+  </data>
+  <data name="ZoomOut" xml:space="preserve">
+    <value>Zoom out</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ko-KR.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ko-KR.resx
index 295d0acb..2579b146 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ko-KR.resx
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ko-KR.resx
@@ -204,4 +204,10 @@
   <data name="Yes" xml:space="preserve">
     <value>네</value>
   </data>
+  <data name="ZoomIn" xml:space="preserve">
+    <value>Zoom in</value>
+  </data>
+  <data name="ZoomOut" xml:space="preserve">
+    <value>Zoom out</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.resx
index 76827085..679dd9bb 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.resx
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.resx
@@ -184,4 +184,10 @@
   <data name="No" xml:space="preserve">
     <value>否</value>
   </data>
+  <data name="ZoomIn" xml:space="preserve">
+    <value>放大</value>
+  </data>
+  <data name="ZoomOut" xml:space="preserve">
+    <value>缩小</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/SliderBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/SliderBaseStyle.xaml
index 9d71bc2a..d371ad3a 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/SliderBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/SliderBaseStyle.xaml
@@ -72,7 +72,7 @@
 
     <ControlTemplate x:Key="TipSliderThumbHorizontalTop" TargetType="Thumb">
         <controls:InternalCanvas>
-            <Label Name="LabelValue" Opacity="0" Canvas.Bottom="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}"/>
+            <Label Name="LabelValue" Opacity="0" Canvas.Bottom="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}" ContentStringFormat="{Binding Path=(controls:TipElement.StringFormat),RelativeSource={RelativeSource TemplatedParent}}"/>
             <Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9"/>
         </controls:InternalCanvas>
         <ControlTemplate.Triggers>
@@ -103,7 +103,7 @@
 
     <ControlTemplate x:Key="TipSliderThumbHorizontalBottom" TargetType="Thumb">
         <controls:InternalCanvas>
-            <Label Name="LabelValue" Opacity="0" Canvas.Top="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}"/>
+            <Label Name="LabelValue" Opacity="0" Canvas.Top="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}" ContentStringFormat="{Binding Path=(controls:TipElement.StringFormat),RelativeSource={RelativeSource TemplatedParent}}"/>
             <Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9"/>
         </controls:InternalCanvas>
         <ControlTemplate.Triggers>
@@ -134,7 +134,7 @@
 
     <ControlTemplate x:Key="TipSliderThumbVerticalLeft" TargetType="Thumb">
         <controls:InternalCanvas Orientation="Vertical">
-            <Label Name="LabelValue" Opacity="0" Canvas.Right="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}"/>
+            <Label Name="LabelValue" Opacity="0" Canvas.Right="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}" ContentStringFormat="{Binding Path=(controls:TipElement.StringFormat),RelativeSource={RelativeSource TemplatedParent}}"/>
             <Border Canvas.Right="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9"/>
         </controls:InternalCanvas>
         <ControlTemplate.Triggers>
@@ -165,7 +165,7 @@
 
     <ControlTemplate x:Key="TipSliderThumbVerticalRight" TargetType="Thumb">
         <controls:InternalCanvas Orientation="Vertical">
-            <Label Name="LabelValue" Opacity="0" Canvas.Left="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}"/>
+            <Label Name="LabelValue" Opacity="0" Canvas.Left="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}" ContentStringFormat="{Binding Path=(controls:TipElement.StringFormat),RelativeSource={RelativeSource TemplatedParent}}"/>
             <Border Canvas.Right="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9"/>
         </controls:InternalCanvas>
         <ControlTemplate.Triggers>
@@ -223,14 +223,14 @@
         <ControlTemplate.Triggers>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="controls:TipElement.Placement" Value="TopLeft"/>
+                    <Condition Property="controls:TipElement.Placement" Value="Top"/>
                     <Condition Property="controls:TipElement.Visibility" Value="Visible"/>
                 </MultiTrigger.Conditions>
                 <Setter Property="Template" TargetName="Thumb" Value="{StaticResource TipSliderThumbHorizontalTop}"/>
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="controls:TipElement.Placement" Value="BottomRight"/>
+                    <Condition Property="controls:TipElement.Placement" Value="Bottom"/>
                     <Condition Property="controls:TipElement.Visibility" Value="Visible"/>
                 </MultiTrigger.Conditions>
                 <Setter Property="Template" TargetName="Thumb" Value="{StaticResource TipSliderThumbHorizontalBottom}"/>
@@ -280,14 +280,14 @@
         <ControlTemplate.Triggers>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="controls:TipElement.Placement" Value="TopLeft"/>
+                    <Condition Property="controls:TipElement.Placement" Value="Left"/>
                     <Condition Property="controls:TipElement.Visibility" Value="Visible"/>
                 </MultiTrigger.Conditions>
                 <Setter Property="Template" TargetName="Thumb" Value="{StaticResource TipSliderThumbVerticalLeft}"/>
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="controls:TipElement.Placement" Value="BottomRight"/>
+                    <Condition Property="controls:TipElement.Placement" Value="Right"/>
                     <Condition Property="controls:TipElement.Visibility" Value="Visible"/>
                 </MultiTrigger.Conditions>
                 <Setter Property="Template" TargetName="Thumb" Value="{StaticResource TipSliderThumbVerticalRight}"/>
@@ -709,7 +709,7 @@
 
     <ControlTemplate x:Key="TipRangeSliderThumbHorizontalTop" TargetType="controls:RangeThumb">
         <controls:InternalCanvas>
-            <Label Name="LabelValue" Opacity="0" Canvas.Bottom="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}"/>
+            <Label Name="LabelValue" Opacity="0" Canvas.Bottom="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}" ContentStringFormat="{Binding Path=(controls:TipElement.StringFormat),RelativeSource={RelativeSource TemplatedParent}}"/>
             <Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9"/>
         </controls:InternalCanvas>
         <ControlTemplate.Triggers>
@@ -740,7 +740,7 @@
 
     <ControlTemplate x:Key="TipRangeSliderThumbHorizontalBottom" TargetType="controls:RangeThumb">
         <controls:InternalCanvas>
-            <Label Name="LabelValue" Opacity="0" Canvas.Top="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}"/>
+            <Label Name="LabelValue" Opacity="0" Canvas.Top="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}" ContentStringFormat="{Binding Path=(controls:TipElement.StringFormat),RelativeSource={RelativeSource TemplatedParent}}"/>
             <Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9"/>
         </controls:InternalCanvas>
         <ControlTemplate.Triggers>
@@ -771,7 +771,7 @@
 
     <ControlTemplate x:Key="TipRangeSliderThumbVerticalLeft" TargetType="controls:RangeThumb">
         <controls:InternalCanvas Orientation="Vertical">
-            <Label Name="LabelValue" Opacity="0" Canvas.Right="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}"/>
+            <Label Name="LabelValue" Opacity="0" Canvas.Right="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}" ContentStringFormat="{Binding Path=(controls:TipElement.StringFormat),RelativeSource={RelativeSource TemplatedParent}}"/>
             <Border Canvas.Right="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9"/>
         </controls:InternalCanvas>
         <ControlTemplate.Triggers>
@@ -802,7 +802,7 @@
 
     <ControlTemplate x:Key="TipRangeSliderThumbVerticalRight" TargetType="controls:RangeThumb">
         <controls:InternalCanvas Orientation="Vertical">
-            <Label Name="LabelValue" Opacity="0" Canvas.Left="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}"/>
+            <Label Name="LabelValue" Opacity="0" Canvas.Left="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}" ContentStringFormat="{Binding Path=(controls:TipElement.StringFormat),RelativeSource={RelativeSource TemplatedParent}}"/>
             <Border Canvas.Right="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9"/>
         </controls:InternalCanvas>
         <ControlTemplate.Triggers>
@@ -862,7 +862,7 @@
         <ControlTemplate.Triggers>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="controls:TipElement.Placement" Value="TopLeft"/>
+                    <Condition Property="controls:TipElement.Placement" Value="Top"/>
                     <Condition Property="controls:TipElement.Visibility" Value="Visible"/>
                 </MultiTrigger.Conditions>
                 <Setter Property="Template" TargetName="ThumbStart" Value="{StaticResource TipRangeSliderThumbHorizontalTop}"/>
@@ -870,7 +870,7 @@
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="controls:TipElement.Placement" Value="BottomRight"/>
+                    <Condition Property="controls:TipElement.Placement" Value="Bottom"/>
                     <Condition Property="controls:TipElement.Visibility" Value="Visible"/>
                 </MultiTrigger.Conditions>
                 <Setter Property="Template" TargetName="ThumbStart" Value="{StaticResource TipRangeSliderThumbHorizontalBottom}"/>
@@ -920,7 +920,7 @@
         <ControlTemplate.Triggers>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="controls:TipElement.Placement" Value="TopLeft"/>
+                    <Condition Property="controls:TipElement.Placement" Value="Left"/>
                     <Condition Property="controls:TipElement.Visibility" Value="Visible"/>
                 </MultiTrigger.Conditions>
                 <Setter Property="Template" TargetName="ThumbStart" Value="{StaticResource TipRangeSliderThumbVerticalLeft}"/>
@@ -928,7 +928,7 @@
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="controls:TipElement.Placement" Value="BottomRight"/>
+                    <Condition Property="controls:TipElement.Placement" Value="Right"/>
                     <Condition Property="controls:TipElement.Visibility" Value="Visible"/>
                 </MultiTrigger.Conditions>
                 <Setter Property="Template" TargetName="ThumbStart" Value="{StaticResource TipRangeSliderThumbVerticalRight}"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/FlowDocumentScrollViewer.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/FlowDocumentScrollViewer.xaml
new file mode 100644
index 00000000..e64aedab
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/FlowDocumentScrollViewer.xaml
@@ -0,0 +1,55 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:HandyControl.Controls"
+                    xmlns:langs="clr-namespace:HandyControl.Properties.Langs">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../Basic/Sizes.xaml"/>
+        <ResourceDictionary Source="../Basic/Geometries.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style TargetType="FlowDocumentScrollViewer">
+        <Setter Property="controls:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+        <Setter Property="KeyboardNavigation.TabNavigation" Value="Local"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="FlowDocumentScrollViewer">
+                    <Grid Background="{TemplateBinding Background}">
+                        <Grid.RowDefinitions>
+                            <RowDefinition/>
+                            <RowDefinition Height="Auto"/>
+                        </Grid.RowDefinitions>
+                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="{TemplateBinding Padding}" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+                            <ScrollViewer x:Name="PART_ContentHost" CanContentScroll="True" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        </Border>
+                        <Border x:Name="PART_ToolBarHost" Grid.Row="1" Margin="0,4">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+                                <Border x:Name="PART_FindToolBarHost" Grid.Column="0" HorizontalAlignment="Left" Visibility="Collapsed" VerticalAlignment="Center"/>
+                                <Grid Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <RepeatButton Height="18" Width="18" Padding="4,7" controls:BorderElement.CornerRadius="9" controls:IconElement.Geometry="{StaticResource SubGeometry}" Grid.Column="0" Command="NavigationCommands.DecreaseZoom" IsEnabled="{TemplateBinding CanDecreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomOut}"/>
+                                    <Slider controls:TipElement.Visibility="Visible" controls:TipElement.Placement="Top" Grid.Column="1" HorizontalAlignment="Stretch" LargeChange="{TemplateBinding ZoomIncrement}" Maximum="{TemplateBinding MaxZoom}" Minimum="{TemplateBinding MinZoom}" SmallChange="{TemplateBinding ZoomIncrement}" TickFrequency="{TemplateBinding ZoomIncrement}" Value="{Binding Zoom, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" Width="180"/>
+                                    <RepeatButton Height="18" Width="18" Padding="4" controls:BorderElement.CornerRadius="9" controls:IconElement.Geometry="{StaticResource AddGeometry}" Grid.Column="2" Command="NavigationCommands.IncreaseZoom" IsEnabled="{TemplateBinding CanIncreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomIn}"/>
+                                </Grid>
+                            </Grid>
+                        </Border>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml
index 063d9132..5a7386e4 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml
@@ -81,6 +81,7 @@
         <ResourceDictionary Source="PinBox.xaml"/>
         <ResourceDictionary Source="Separator.xaml"/>
         <ResourceDictionary Source="StatusBar.xaml"/>
+        <ResourceDictionary Source="FlowDocumentScrollViewer.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>
\ No newline at end of file

From de5c2e7a6ec0f312ae2da91fcf27873fd11f346f Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Fri, 17 Jan 2020 23:34:00 +0800
Subject: [PATCH 10/41] init branch

---
 .../HandyControlDemo_Core30.csproj            |   3 ++
 .../HandyControlDemo_Net_40.csproj            |   3 ++
 .../HandyControlDemo_Net_GE45.csproj          |   3 ++
 .../Data/DemoInfo.json                        |   4 +--
 .../Data/MessageToken.cs                      |   2 ++
 .../Data/MessageToken.tt                      |   3 +-
 .../HandyControlDemo_Shared.projitems         |   7 +++++
 .../Properties/Langs/Lang.Designer.cs         |   9 ++++++
 .../Properties/Langs/Lang.en.resx             |   3 ++
 .../Properties/Langs/Lang.fa.resx             |   3 ++
 .../Properties/Langs/Lang.fr.resx             |   3 ++
 .../Properties/Langs/Lang.ko-KR.resx          |   3 ++
 .../Properties/Langs/Lang.resx                |   3 ++
 .../OutlinedRectangleTool_16x.png             | Bin 0 -> 133 bytes
 .../UserControl/Controls/WindowDemoCtl.xaml   |   3 ++
 .../Window/BlurWindow.xaml                    |  26 +++++++++---------
 .../Window/GlowWindow.xaml                    |  17 ++++++++++++
 .../Window/GlowWindow.xaml.cs                 |  10 +++++++
 .../Controls/Window/GlowWindow.cs             |   7 +++++
 .../HandyControl_Shared.projitems             |   1 +
 20 files changed, 97 insertions(+), 16 deletions(-)
 create mode 100644 src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/OutlinedRectangleTool_16x.png
 create mode 100644 src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml
 create mode 100644 src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml.cs
 create mode 100644 src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs

diff --git a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj
index f91f3b1d..80a476b3 100644
--- a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj
+++ b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj
@@ -460,6 +460,9 @@
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\WPFFlowDocument_16x.png">
       <Link>Resources\Img\LeftMainContent\WPFFlowDocument_16x.png</Link>
     </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png">
+      <Link>Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png</Link>
+    </Resource>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\..\Shared\HandyControlDemo_Shared\Properties\Langs\Lang.en.resx">
diff --git a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
index bba16269..98fcf4f6 100644
--- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
+++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
@@ -526,6 +526,9 @@
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\WPFFlowDocument_16x.png">
       <Link>Resources\Img\LeftMainContent\WPFFlowDocument_16x.png</Link>
     </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png">
+      <Link>Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png</Link>
+    </Resource>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Data\DemoInfo.json">
diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
index 94a32b27..2fd623be 100644
--- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
@@ -589,6 +589,9 @@
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\WPFFlowDocument_16x.png">
       <Link>Resources\Img\LeftMainContent\WPFFlowDocument_16x.png</Link>
     </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png">
+      <Link>Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png</Link>
+    </Resource>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\fabric-icons.ttf">
diff --git a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json
index 09201d74..89503cad 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json
+++ b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json
@@ -45,7 +45,7 @@
       [ "ButtonGroup", "ButtonGroupDemoCtl", "ButtonGroup_16x", "" ],
       [ "ProgressButton", "ProgressButtonDemoCtl", "ProgressButton_16x", "" ],
       [ "ChatBubble", "ChatBubbleDemoCtl", "Bubble_16xLG", "" ],
-      [ "Poptip", "PoptipDemoCtl", "PopupCursor_16x", "1" ],
+      [ "Poptip", "PoptipDemoCtl", "PopupCursor_16x", "" ],
       [ "NotifyIcon", "NotifyIconDemoCtl", "NotificationHub_16x", "" ],
       [ "NumericUpDown", "NumericUpDownDemoCtl", "NumericListBox_16x", "" ],
       [ "TextBox", "TextBoxDemoCtl", "TextBox_16x", "" ],
@@ -96,7 +96,7 @@
       [ "Sprite", "SpriteDemoCtl", "HandyControl", "" ],
       [ "Notification", "NotificationDemoCtl", "Procedure_16x", "" ],
       [ "Dialog", "DialogDemoCtl", "Dialog_16x", "" ],
-      [ "Window", "WindowDemoCtl", "WindowsForm_16x", "" ]
+      [ "Window", "WindowDemoCtl", "WindowsForm_16x", "1" ]
     ]
   },
   {
diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs
index 5d039b04..e18b5fb7 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs
@@ -40,5 +40,7 @@
 
         public static readonly string QQGroupView = nameof(QQGroupView);
 
+        public static readonly string GlowWindow = nameof(GlowWindow);
+
     }
 }
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt
index 885626a9..db0696aa 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt
+++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt
@@ -22,7 +22,8 @@ var messageList = new List<string>
 	"BlurWindow",
 	"CustomNonClientAreaWindow",
 	"NoNonClientAreaDragableWindow",
-	"QQGroupView"
+	"QQGroupView",
+	"GlowWindow"
 };
 #>
 namespace HandyControlDemo.Data
diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
index 17fed60e..45a6fcf3 100644
--- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
+++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
@@ -407,6 +407,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)Window\DialogDemoWindow.xaml.cs">
       <DependentUpon>DialogDemoWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Window\GlowWindow.xaml.cs">
+      <DependentUpon>GlowWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Window\GrowlDemoWindow.xaml.cs">
       <DependentUpon>GrowlDemoWindow.xaml</DependentUpon>
     </Compile>
@@ -923,6 +926,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Window\GlowWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Window\GrowlDemoWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
index 0a7a2898..21e62118 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
@@ -1050,6 +1050,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 点击打开辉光窗口 的本地化字符串。
+        /// </summary>
+        public static string OpenGlowWindow {
+            get {
+                return ResourceManager.GetString("OpenGlowWindow", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 点击打开图片浏览器 的本地化字符串。
         /// </summary>
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
index eec92d63..dbc55e2a 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
@@ -717,4 +717,7 @@
   <data name="FlowDocumentScrollViewer" xml:space="preserve">
     <value>FlowDocumentScrollViewer</value>
   </data>
+  <data name="OpenGlowWindow" xml:space="preserve">
+    <value>Open glowWindow</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx
index 17f72064..6f5aec9c 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx
@@ -717,4 +717,7 @@
   <data name="FlowDocumentScrollViewer" xml:space="preserve">
     <value>FlowDocumentScrollViewer</value>
   </data>
+  <data name="OpenGlowWindow" xml:space="preserve">
+    <value>Open glowWindow</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx
index 2a9f70e6..51edab20 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx
@@ -717,4 +717,7 @@
   <data name="FlowDocumentScrollViewer" xml:space="preserve">
     <value>FlowDocumentScrollViewer</value>
   </data>
+  <data name="OpenGlowWindow" xml:space="preserve">
+    <value>Open glowWindow</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx
index b16ff604..67447dbd 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx
@@ -717,4 +717,7 @@
   <data name="FlowDocumentScrollViewer" xml:space="preserve">
     <value>FlowDocumentScrollViewer</value>
   </data>
+  <data name="OpenGlowWindow" xml:space="preserve">
+    <value>Open glowWindow</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
index 45a4e46c..a6a4fc1d 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
@@ -717,4 +717,7 @@
   <data name="FlowDocumentScrollViewer" xml:space="preserve">
     <value>流文档滚动视图</value>
   </data>
+  <data name="OpenGlowWindow" xml:space="preserve">
+    <value>点击打开辉光窗口</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/OutlinedRectangleTool_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/OutlinedRectangleTool_16x.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb6eb86b80a39faf8e9d18423d1e162b80397f4a
GIT binary patch
literal 133
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5he4R}c>anMprE;@
zi(^Pd+}lfrTnq|4&KKwCe&6r?dQ#{?;f|##nGe?IbN!jTMLV|Pi9fHyv8t7<5(oY_
cdu@2n5L$2jd|oN5BG3p1Pgg&ebxsLQ08m{j=l}o!

literal 0
HcmV?d00001

diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml
index 7417064e..aeb6f37f 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml
@@ -16,6 +16,9 @@
             <Button Click="ButtonCustomContent_OnClick" Content="{x:Static langs:Lang.OpenCustomContentWindow}"/>
             <Button Name="ButtonMouseFollow" Click="ButtonMouseFollow_OnClick" Content="{x:Static langs:Lang.OpenMouseFollowWindow}"/>
             <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.NoNonClientAreaDragableWindow}" Content="{x:Static langs:Lang.OpenNoNonClientAreaDragableWindow}"/>
+            <hc:Badge Text="New" Style="{StaticResource BadgeDanger}" VerticalAlignment="Center" HorizontalAlignment="Center" BadgeMargin="0,-10,-20,0">
+                <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.GlowWindow}" Content="{x:Static langs:Lang.OpenGlowWindow}"/>
+            </hc:Badge>
         </UniformGrid>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml
index 6a192705..3bcb277a 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml
@@ -1,15 +1,15 @@
 <hc:BlurWindow x:Class="HandyControlDemo.Window.BlurWindow"
-                     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:hc="https://handyorg.github.io/handycontrol"
-                     xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-                     mc:Ignorable="d"
-                     WindowStartupLocation="CenterScreen"
-                     Title="{x:Static langs:Lang.Title}"
-                     Style="{StaticResource WindowBlur}"
-                     Height="450" 
-                     Width="800" 
-                     Icon="/HandyControlDemo;component/Resources/Img/icon.ico">
+               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:hc="https://handyorg.github.io/handycontrol"
+               xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+               mc:Ignorable="d"
+               WindowStartupLocation="CenterScreen"
+               Title="{x:Static langs:Lang.Title}"
+               Style="{StaticResource WindowBlur}"
+               Height="450" 
+               Width="800" 
+               Icon="/HandyControlDemo;component/Resources/Img/icon.ico">
 </hc:BlurWindow>
diff --git a/src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml
new file mode 100644
index 00000000..d24c5ea6
--- /dev/null
+++ b/src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml
@@ -0,0 +1,17 @@
+<hc:GlowWindow x:Class="HandyControlDemo.Window.GlowWindow"
+               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:hc="https://handyorg.github.io/handycontrol"
+               xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+               mc:Ignorable="d"
+               WindowStartupLocation="CenterScreen"
+               Title="{x:Static langs:Lang.Title}"
+               Height="450" 
+               Width="800" 
+               Icon="/HandyControlDemo;component/Resources/Img/icon.ico">
+    <Grid>
+        
+    </Grid>
+</hc:GlowWindow>
diff --git a/src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml.cs
new file mode 100644
index 00000000..a58d408f
--- /dev/null
+++ b/src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml.cs
@@ -0,0 +1,10 @@
+namespace HandyControlDemo.Window
+{
+    public partial class GlowWindow
+    {
+        public GlowWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs b/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs
new file mode 100644
index 00000000..eba66263
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs
@@ -0,0 +1,7 @@
+namespace HandyControl.Controls
+{
+    public class GlowWindow : System.Windows.Window
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index cb8ba292..9a285e77 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -41,6 +41,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Slider\RangeSlider\RangeThumb.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Slider\RangeSlider\TwoWayRangeBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Block\RunningBlock.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Window\GlowWindow.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\DrawerShowMode.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\HatchStyle.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\HitMode.cs" />

From a3dd633a6632ed6e070f1d1d6d1aac7019944907 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 18 Jan 2020 00:13:41 +0800
Subject: [PATCH 11/41] refactor Interop classes

---
 .../Controls/Attach/WindowAttach.cs           |   2 +-
 .../Controls/ColorPicker/ColorDropper.cs      |   8 +-
 .../Controls/Other/NotifyIcon.cs              | 114 ++--
 .../Data/Args/MouseHookEventArgs.cs           |   2 +-
 .../HandyControl_Shared.projitems             |  25 +-
 .../Commands/PushMainWindow2TopCommand.cs     |   2 +-
 .../Tools/Helper/IconHelper.cs                |  32 +-
 .../Tools/Helper/WindowHelper.cs              |  28 +-
 .../Tools/Hook/ClipboardHook.cs               |   6 +-
 .../Tools/Hook/KeyboardHook.cs                |  20 +-
 .../Tools/Hook/MouseHook.cs                   |  18 +-
 .../Tools/Hook/SystemMenuHook.cs              |  10 +-
 .../Tools/Interop/BITMAPINFO.cs               |  54 --
 .../Tools/Interop/ExternDll.cs                |  11 -
 .../Interop/{ => Handle}/BitmapHandle.cs      |   2 +-
 .../Interop/{ => Handle}/CommonHandles.cs     |   0
 .../Interop/{ => Handle}/HandleCollector.cs   |   0
 .../Tools/Interop/{ => Handle}/IconHandle.cs  |   2 +-
 .../{ => Handle}/SafeFileMappingHandle.cs     |   2 +-
 .../Interop/{ => Handle}/WpfSafeHandle.cs     |   0
 .../Tools/Interop/ICONINFO.cs                 |  16 -
 .../Tools/Interop/InteropMethods.cs           | 281 +++++++++
 .../Tools/Interop/InteropValues.cs            | 532 ++++++++++++++++++
 .../Tools/Interop/NOTIFYICONDATA.cs           |  28 -
 .../Tools/Interop/NativeMethods.cs            | 246 --------
 .../Tools/Interop/NativeValues.cs             | 235 --------
 .../Tools/Interop/UnsafeNativeMethods.cs      | 225 --------
 .../Tools/Interop/WNDCLASS.cs                 |  23 -
 28 files changed, 948 insertions(+), 976 deletions(-)
 delete mode 100644 src/Shared/HandyControl_Shared/Tools/Interop/BITMAPINFO.cs
 delete mode 100644 src/Shared/HandyControl_Shared/Tools/Interop/ExternDll.cs
 rename src/Shared/HandyControl_Shared/Tools/Interop/{ => Handle}/BitmapHandle.cs (95%)
 rename src/Shared/HandyControl_Shared/Tools/Interop/{ => Handle}/CommonHandles.cs (100%)
 rename src/Shared/HandyControl_Shared/Tools/Interop/{ => Handle}/HandleCollector.cs (100%)
 rename src/Shared/HandyControl_Shared/Tools/Interop/{ => Handle}/IconHandle.cs (92%)
 rename src/Shared/HandyControl_Shared/Tools/Interop/{ => Handle}/SafeFileMappingHandle.cs (95%)
 rename src/Shared/HandyControl_Shared/Tools/Interop/{ => Handle}/WpfSafeHandle.cs (100%)
 delete mode 100644 src/Shared/HandyControl_Shared/Tools/Interop/ICONINFO.cs
 create mode 100644 src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs
 create mode 100644 src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
 delete mode 100644 src/Shared/HandyControl_Shared/Tools/Interop/NOTIFYICONDATA.cs
 delete mode 100644 src/Shared/HandyControl_Shared/Tools/Interop/NativeMethods.cs
 delete mode 100644 src/Shared/HandyControl_Shared/Tools/Interop/NativeValues.cs
 delete mode 100644 src/Shared/HandyControl_Shared/Tools/Interop/UnsafeNativeMethods.cs
 delete mode 100644 src/Shared/HandyControl_Shared/Tools/Interop/WNDCLASS.cs

diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/WindowAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/WindowAttach.cs
index 911f6fec..dd6a8db5 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/WindowAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/WindowAttach.cs
@@ -97,7 +97,7 @@ namespace HandyControl.Controls
             {
                 var _ = new WindowInteropHelper(window)
                 {
-                    Owner = NativeMethods.GetDesktopWindow()
+                    Owner = InteropMethods.GetDesktopWindow()
                 };
             }
         }
diff --git a/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorDropper.cs b/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorDropper.cs
index dc9ecf92..0aea9a99 100644
--- a/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorDropper.cs
+++ b/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorDropper.cs
@@ -96,10 +96,10 @@ namespace HandyControl.Controls
 
         public static Color GetColorAt(int x, int y)
         {
-            var desk = UnsafeNativeMethods.GetDesktopWindow();
-            var dc = UnsafeNativeMethods.GetWindowDC(desk);
-            var a = (int)UnsafeNativeMethods.GetPixel(dc, x, y);
-            UnsafeNativeMethods.ReleaseDC(desk, dc);
+            var desk = InteropMethods.GetDesktopWindow();
+            var dc = InteropMethods.GetWindowDC(desk);
+            var a = (int)InteropMethods.GetPixel(dc, x, y);
+            InteropMethods.ReleaseDC(desk, dc);
             return Color.FromArgb(255, (byte) ((a >> 0) & 0xff), (byte) ((a >> 8) & 0xff), (byte) ((a >> 16) & 0xff));
         }
     }
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
index 988b72c4..831d7f22 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
@@ -33,7 +33,7 @@ namespace HandyControl.Controls
 
         private IconHandle _iconHandle;
 
-        private const int WmTrayMouseMessage = NativeMethods.WM_USER + 1024;
+        private const int WmTrayMouseMessage = InteropValues.WM_USER + 1024;
 
         private string _windowClassName;
 
@@ -41,7 +41,7 @@ namespace HandyControl.Controls
 
         private IntPtr _messageWindowHandle;
 
-        private readonly WndProc _callback;
+        private readonly InteropValues.WndProc _callback;
 
         private Popup _contextContent;
 
@@ -165,9 +165,9 @@ namespace HandyControl.Controls
         {
             if (!_added || DesignerHelper.IsInDesignMode) return;
 
-            var data = new NOTIFYICONDATA
+            var data = new InteropValues.NOTIFYICONDATA
             {
-                uFlags = NativeMethods.NIF_INFO,
+                uFlags = InteropValues.NIF_INFO,
                 hWnd = _messageWindowHandle,
                 uID = _id,
                 szInfoTitle = title ?? string.Empty,
@@ -177,20 +177,20 @@ namespace HandyControl.Controls
             switch (infoType)
             {
                 case NotifyIconInfoType.Info:
-                    data.dwInfoFlags = NativeMethods.NIIF_INFO;
+                    data.dwInfoFlags = InteropValues.NIIF_INFO;
                     break;
                 case NotifyIconInfoType.Warning:
-                    data.dwInfoFlags = NativeMethods.NIIF_WARNING;
+                    data.dwInfoFlags = InteropValues.NIIF_WARNING;
                     break;
                 case NotifyIconInfoType.Error:
-                    data.dwInfoFlags = NativeMethods.NIIF_ERROR;
+                    data.dwInfoFlags = InteropValues.NIIF_ERROR;
                     break;
                 case NotifyIconInfoType.None:
-                    data.dwInfoFlags = NativeMethods.NIIF_NONE;
+                    data.dwInfoFlags = InteropValues.NIIF_NONE;
                     break;
             }
 
-            UnsafeNativeMethods.Shell_NotifyIcon(NativeMethods.NIM_MODIFY, data);
+            InteropMethods.Shell_NotifyIcon(InteropValues.NIM_MODIFY, data);
         }
 
         public void Dispose()
@@ -330,7 +330,7 @@ namespace HandyControl.Controls
         {
             var isTrue = FindNotifyIcon(out var rectNotify);
             if (!isTrue) return false;
-            NativeMethods.GetCursorPos(out var point);
+            InteropMethods.GetCursorPos(out var point);
             if (point.X >= rectNotify.Left && point.X <= rectNotify.Right &&
                 point.Y >= rectNotify.Top && point.Y <= rectNotify.Bottom)
             {
@@ -368,17 +368,17 @@ namespace HandyControl.Controls
         //referenced from http://www.cnblogs.com/sczmzx/p/5158127.html
         private IntPtr FindTrayToolbarWindow()
         {
-            var hWnd = NativeMethods.FindWindow("Shell_TrayWnd", null);
+            var hWnd = InteropMethods.FindWindow("Shell_TrayWnd", null);
             if (hWnd != IntPtr.Zero)
             {
-                hWnd = NativeMethods.FindWindowEx(hWnd, IntPtr.Zero, "TrayNotifyWnd", null);
+                hWnd = InteropMethods.FindWindowEx(hWnd, IntPtr.Zero, "TrayNotifyWnd", null);
                 if (hWnd != IntPtr.Zero)
                 {
 
-                    hWnd = NativeMethods.FindWindowEx(hWnd, IntPtr.Zero, "SysPager", null);
+                    hWnd = InteropMethods.FindWindowEx(hWnd, IntPtr.Zero, "SysPager", null);
                     if (hWnd != IntPtr.Zero)
                     {
-                        hWnd = NativeMethods.FindWindowEx(hWnd, IntPtr.Zero, "ToolbarWindow32", null);
+                        hWnd = InteropMethods.FindWindowEx(hWnd, IntPtr.Zero, "ToolbarWindow32", null);
 
                     }
                 }
@@ -389,17 +389,17 @@ namespace HandyControl.Controls
         //referenced from http://www.cnblogs.com/sczmzx/p/5158127.html
         private IntPtr FindTrayToolbarOverFlowWindow()
         {
-            var hWnd = NativeMethods.FindWindow("NotifyIconOverflowWindow", null);
+            var hWnd = InteropMethods.FindWindow("NotifyIconOverflowWindow", null);
             if (hWnd != IntPtr.Zero)
             {
-                hWnd = NativeMethods.FindWindowEx(hWnd, IntPtr.Zero, "ToolbarWindow32", null);
+                hWnd = InteropMethods.FindWindowEx(hWnd, IntPtr.Zero, "ToolbarWindow32", null);
             }
             return hWnd;
         }
 
-        private bool FindNotifyIcon(out NativeMethods.RECT rect)
+        private bool FindNotifyIcon(out InteropValues.RECT rect)
         {
-            var rectNotify = new NativeMethods.RECT();
+            var rectNotify = new InteropValues.RECT();
             var hTrayWnd = FindTrayToolbarWindow();
             var isTrue = FindNotifyIcon(hTrayWnd, ref rectNotify);
             if (!isTrue)
@@ -412,48 +412,48 @@ namespace HandyControl.Controls
         }
 
         //referenced from http://www.cnblogs.com/sczmzx/p/5158127.html
-        private bool FindNotifyIcon(IntPtr hTrayWnd, ref NativeMethods.RECT rectNotify)
+        private bool FindNotifyIcon(IntPtr hTrayWnd, ref InteropValues.RECT rectNotify)
         {
-            NativeMethods.GetWindowRect(hTrayWnd, out var rectTray);
-            var count = (int)NativeMethods.SendMessage(hTrayWnd, NativeMethods.TB_BUTTONCOUNT, 0, IntPtr.Zero);
+            InteropMethods.GetWindowRect(hTrayWnd, out var rectTray);
+            var count = (int)InteropMethods.SendMessage(hTrayWnd, InteropValues.TB_BUTTONCOUNT, 0, IntPtr.Zero);
 
             var isFind = false;
             if (count > 0)
             {
-                NativeMethods.GetWindowThreadProcessId(hTrayWnd, out var trayPid);
-                var hProcess = NativeMethods.OpenProcess(NativeMethods.ProcessAccess.VMOperation | NativeMethods.ProcessAccess.VMRead | NativeMethods.ProcessAccess.VMWrite, false, trayPid);
-                var address = NativeMethods.VirtualAllocEx(hProcess, IntPtr.Zero, 1024, NativeMethods.AllocationType.Commit, NativeMethods.MemoryProtection.ReadWrite);
+                InteropMethods.GetWindowThreadProcessId(hTrayWnd, out var trayPid);
+                var hProcess = InteropMethods.OpenProcess(InteropValues.ProcessAccess.VMOperation | InteropValues.ProcessAccess.VMRead | InteropValues.ProcessAccess.VMWrite, false, trayPid);
+                var address = InteropMethods.VirtualAllocEx(hProcess, IntPtr.Zero, 1024, InteropValues.AllocationType.Commit, InteropValues.MemoryProtection.ReadWrite);
 
-                var btnData = new NativeMethods.TBBUTTON();
-                var trayData = new NativeMethods.TRAYDATA();
+                var btnData = new InteropValues.TBBUTTON();
+                var trayData = new InteropValues.TRAYDATA();
                 var handel = Process.GetCurrentProcess().Id;
 
                 for (uint i = 0; i < count; i++)
                 {
-                    NativeMethods.SendMessage(hTrayWnd, NativeMethods.TB_GETBUTTON, i, address);
-                    var isTrue = NativeMethods.ReadProcessMemory(hProcess, address, out btnData, Marshal.SizeOf(btnData), out _);
+                    InteropMethods.SendMessage(hTrayWnd, InteropValues.TB_GETBUTTON, i, address);
+                    var isTrue = InteropMethods.ReadProcessMemory(hProcess, address, out btnData, Marshal.SizeOf(btnData), out _);
                     if (!isTrue) continue;
                     if (btnData.dwData == IntPtr.Zero)
                     {
                         btnData.dwData = btnData.iString;
                     }
-                    NativeMethods.ReadProcessMemory(hProcess, btnData.dwData, out trayData, Marshal.SizeOf(trayData), out _);
-                    NativeMethods.GetWindowThreadProcessId(trayData.hwnd, out var dwProcessId);
+                    InteropMethods.ReadProcessMemory(hProcess, btnData.dwData, out trayData, Marshal.SizeOf(trayData), out _);
+                    InteropMethods.GetWindowThreadProcessId(trayData.hwnd, out var dwProcessId);
                     if (dwProcessId == (uint)handel)
                     {
-                        var rect = new NativeMethods.RECT();
-                        var lngRect = NativeMethods.VirtualAllocEx(hProcess, IntPtr.Zero, Marshal.SizeOf(typeof(Rect)), NativeMethods.AllocationType.Commit, NativeMethods.MemoryProtection.ReadWrite);
-                        NativeMethods.SendMessage(hTrayWnd, NativeMethods.TB_GETITEMRECT, i, lngRect);
-                        NativeMethods.ReadProcessMemory(hProcess, lngRect, out rect, Marshal.SizeOf(rect), out _);
+                        var rect = new InteropValues.RECT();
+                        var lngRect = InteropMethods.VirtualAllocEx(hProcess, IntPtr.Zero, Marshal.SizeOf(typeof(Rect)), InteropValues.AllocationType.Commit, InteropValues.MemoryProtection.ReadWrite);
+                        InteropMethods.SendMessage(hTrayWnd, InteropValues.TB_GETITEMRECT, i, lngRect);
+                        InteropMethods.ReadProcessMemory(hProcess, lngRect, out rect, Marshal.SizeOf(rect), out _);
 
-                        NativeMethods.VirtualFreeEx(hProcess, lngRect, Marshal.SizeOf(rect), NativeMethods.FreeType.Decommit);
-                        NativeMethods.VirtualFreeEx(hProcess, lngRect, 0, NativeMethods.FreeType.Release);
+                        InteropMethods.VirtualFreeEx(hProcess, lngRect, Marshal.SizeOf(rect), InteropValues.FreeType.Decommit);
+                        InteropMethods.VirtualFreeEx(hProcess, lngRect, 0, InteropValues.FreeType.Release);
 
                         var left = rectTray.Left + rect.Left;
                         var top = rectTray.Top + rect.Top;
                         var botton = rectTray.Top + rect.Bottom;
                         var right = rectTray.Left + rect.Right;
-                        rectNotify = new NativeMethods.RECT
+                        rectNotify = new InteropValues.RECT
                         {
                             Left = left,
                             Right = right,
@@ -464,9 +464,9 @@ namespace HandyControl.Controls
                         break;
                     }
                 }
-                NativeMethods.VirtualFreeEx(hProcess, address, 0x4096, NativeMethods.FreeType.Decommit);
-                NativeMethods.VirtualFreeEx(hProcess, address, 0, NativeMethods.FreeType.Release);
-                NativeMethods.CloseHandle(hProcess);
+                InteropMethods.VirtualFreeEx(hProcess, address, 0x4096, InteropValues.FreeType.Decommit);
+                InteropMethods.VirtualFreeEx(hProcess, address, 0, InteropValues.FreeType.Release);
+                InteropMethods.CloseHandle(hProcess);
             }
             return isFind;            
         }
@@ -496,13 +496,13 @@ namespace HandyControl.Controls
                 if (DesignerHelper.IsInDesignMode) return;
 
                 _isTransparent = isTransparent;
-                var data = new NOTIFYICONDATA
+                var data = new InteropValues.NOTIFYICONDATA
                 {
                     uCallbackMessage = WmTrayMouseMessage,
-                    uFlags = NativeMethods.NIF_MESSAGE | NativeMethods.NIF_ICON | NativeMethods.NIF_TIP,
+                    uFlags = InteropValues.NIF_MESSAGE | InteropValues.NIF_ICON | InteropValues.NIF_TIP,
                     hWnd = _messageWindowHandle,
                     uID = _id,
-                    dwInfoFlags = NativeMethods.NIF_TIP,
+                    dwInfoFlags = InteropValues.NIF_TIP,
                     hIcon = isTransparent ? IntPtr.Zero : _iconCurrentHandle,
                     szTip = Text
                 };
@@ -511,17 +511,17 @@ namespace HandyControl.Controls
                 {
                     if (!_added)
                     {
-                        UnsafeNativeMethods.Shell_NotifyIcon(NativeMethods.NIM_ADD, data);
+                        InteropMethods.Shell_NotifyIcon(InteropValues.NIM_ADD, data);
                         _added = true;
                     }
                     else
                     {
-                        UnsafeNativeMethods.Shell_NotifyIcon(NativeMethods.NIM_MODIFY, data);
+                        InteropMethods.Shell_NotifyIcon(InteropValues.NIM_MODIFY, data);
                     }
                 }
                 else if (_added)
                 {
-                    UnsafeNativeMethods.Shell_NotifyIcon(NativeMethods.NIM_DELETE, data);
+                    InteropMethods.Shell_NotifyIcon(InteropValues.NIM_DELETE, data);
                     _added = false;
                 }
             }
@@ -530,7 +530,7 @@ namespace HandyControl.Controls
         private void RegisterClass()
         {
             _windowClassName = $"HandyControl.Controls.NotifyIcon{Guid.NewGuid()}";
-            var wndclass = new WNDCLASS
+            var wndclass = new InteropValues.WNDCLASS
             {
                 style = 0,
                 lpfnWndProc = _callback,
@@ -544,9 +544,9 @@ namespace HandyControl.Controls
                 lpszClassName = _windowClassName
             };
 
-            UnsafeNativeMethods.RegisterClass(wndclass);
-            _wmTaskbarCreated = NativeMethods.RegisterWindowMessage("TaskbarCreated");
-            _messageWindowHandle = UnsafeNativeMethods.CreateWindowEx(0, _windowClassName, "", 0, 0, 0, 1, 1,
+            InteropMethods.RegisterClass(wndclass);
+            _wmTaskbarCreated = InteropMethods.RegisterWindowMessage("TaskbarCreated");
+            _messageWindowHandle = InteropMethods.CreateWindowEx(0, _windowClassName, "", 0, 0, 0, 1, 1,
                 IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero);
         }
 
@@ -562,17 +562,17 @@ namespace HandyControl.Controls
                 {
                     switch (lparam.ToInt64())
                     {
-                        case NativeMethods.WM_LBUTTONDBLCLK:
+                        case InteropValues.WM_LBUTTONDBLCLK:
                             WmMouseDown(MouseButton.Left, 2);
                             break;
-                        case NativeMethods.WM_LBUTTONUP:
+                        case InteropValues.WM_LBUTTONUP:
                             WmMouseUp(MouseButton.Left);
                             break;
-                        case NativeMethods.WM_RBUTTONUP:
+                        case InteropValues.WM_RBUTTONUP:
                             ShowContextMenu();
                             WmMouseUp(MouseButton.Right);
                             break;
-                        case NativeMethods.WM_MOUSEMOVE:
+                        case InteropValues.WM_MOUSEMOVE:
                             if (!_dispatcherTimerPos.IsEnabled)
                             {
                                 _dispatcherTimerPos.Interval = TimeSpan.FromMilliseconds(200);
@@ -583,7 +583,7 @@ namespace HandyControl.Controls
                 }
             }
 
-            return UnsafeNativeMethods.DefWindowProc(hWnd, msg, wparam, lparam);
+            return InteropMethods.DefWindowProc(hWnd, msg, wparam, lparam);
         }
 
         private void WmMouseDown(MouseButton button, int clicks)
@@ -632,7 +632,7 @@ namespace HandyControl.Controls
                     Content = ContextContent
                 };
                 _contextContent.IsOpen = true;
-                UnsafeNativeMethods.SetForegroundWindow(_contextContent.Child.GetHandle());
+                InteropMethods.SetForegroundWindow(_contextContent.Child.GetHandle());
             }
             else if (ContextMenu != null)
             {
@@ -655,7 +655,7 @@ namespace HandyControl.Controls
                 ContextMenu.Placement = PlacementMode.Mouse;
                 ContextMenu.IsOpen = true;
 
-                UnsafeNativeMethods.SetForegroundWindow(ContextMenu.GetHandle());
+                InteropMethods.SetForegroundWindow(ContextMenu.GetHandle());
             }
         }
 
diff --git a/src/Shared/HandyControl_Shared/Data/Args/MouseHookEventArgs.cs b/src/Shared/HandyControl_Shared/Data/Args/MouseHookEventArgs.cs
index 9c6b03fd..b63114ec 100644
--- a/src/Shared/HandyControl_Shared/Data/Args/MouseHookEventArgs.cs
+++ b/src/Shared/HandyControl_Shared/Data/Args/MouseHookEventArgs.cs
@@ -7,6 +7,6 @@ namespace HandyControl.Data
     {
         public MouseHookMessageType Message { get; set; }
 
-        public NativeMethods.POINT Point { get; set; }
+        public InteropValues.POINT Point { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index 9a285e77..bf76311c 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -310,20 +310,14 @@
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Hook\KeyboardHook.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Hook\MouseHook.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Hook\SystemMenuHook.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\BitmapHandle.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\BITMAPINFO.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\CommonHandles.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\ExternDll.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\HandleCollector.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\IconHandle.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\ICONINFO.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\NativeMethods.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\NativeValues.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\NOTIFYICONDATA.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\SafeFileMappingHandle.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\UnsafeNativeMethods.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\WNDCLASS.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\WpfSafeHandle.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\Handle\BitmapHandle.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\Handle\CommonHandles.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\Handle\HandleCollector.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\Handle\IconHandle.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\InteropMethods.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\InteropValues.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\Handle\SafeFileMappingHandle.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\Handle\WpfSafeHandle.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\MouseDragElementBehaviorEx.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Pool\IPool!1.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Pool\SimplePool!1.cs" />
@@ -944,4 +938,7 @@
     <None Include="$(MSBuildThisFileDirectory)Resources\Effects\ColorComplementEffect.fx" />
     <None Include="$(MSBuildThisFileDirectory)Resources\Effects\GrayScaleEffect.fx" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="$(MSBuildThisFileDirectory)Tools\Interop\Handle\" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Commands/PushMainWindow2TopCommand.cs b/src/Shared/HandyControl_Shared/Interactivity/Commands/PushMainWindow2TopCommand.cs
index 65e96979..07a2427c 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/Commands/PushMainWindow2TopCommand.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Commands/PushMainWindow2TopCommand.cs
@@ -18,7 +18,7 @@ namespace HandyControl.Interactivity
                 var hwndSource = (HwndSource)PresentationSource.FromDependencyObject(Application.Current.MainWindow);
                 if (hwndSource != null)
                 {
-                    UnsafeNativeMethods.SetForegroundWindow(hwndSource.Handle);
+                    InteropMethods.SetForegroundWindow(hwndSource.Handle);
                 }
             }
         }
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/IconHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/IconHelper.cs
index 225302dd..37b68989 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/IconHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/IconHelper.cs
@@ -79,13 +79,13 @@ namespace HandyControl.Tools
 
             try
             {
-                var bi = new BITMAPINFO(width, -height, 32)
+                var bi = new InteropValues.BITMAPINFO(width, -height, 32)
                 {
-                    bmiHeader_biCompression = NativeMethods.BI_RGB
+                    bmiHeader_biCompression = InteropValues.BI_RGB
                 };
 
                 var bits = IntPtr.Zero;
-                colorBitmap = UnsafeNativeMethods.CreateDIBSection(new HandleRef(null, IntPtr.Zero), ref bi, NativeMethods.DIB_RGB_COLORS, ref bits, null, 0);
+                colorBitmap = InteropMethods.CreateDIBSection(new HandleRef(null, IntPtr.Zero), ref bi, InteropValues.DIB_RGB_COLORS, ref bits, null, 0);
 
                 if (colorBitmap.IsInvalid || bits == IntPtr.Zero)
                 {
@@ -95,13 +95,13 @@ namespace HandyControl.Tools
                 Marshal.Copy(colorArray, 0, bits, colorArray.Length);
                 var maskArray = GenerateMaskArray(width, height, colorArray);
 
-                maskBitmap = UnsafeNativeMethods.CreateBitmap(width, height, 1, 1, maskArray);
+                maskBitmap = InteropMethods.CreateBitmap(width, height, 1, 1, maskArray);
                 if (maskBitmap.IsInvalid)
                 {
                     return IconHandle.GetInvalidIcon();
                 }
 
-                var iconInfo = new ICONINFO
+                var iconInfo = new InteropValues.ICONINFO
                 {
                     fIcon = isIcon,
                     xHotspot = xHotspot,
@@ -110,7 +110,7 @@ namespace HandyControl.Tools
                     hbmColor = colorBitmap
                 };
 
-                return UnsafeNativeMethods.CreateIconIndirect(iconInfo);
+                return InteropMethods.CreateIconIndirect(iconInfo);
             }
             finally
             {
@@ -252,21 +252,21 @@ namespace HandyControl.Tools
         {
             if (SystemBitDepth == 0)
             {
-                var hdcDesktop = new HandleRef(null, UnsafeNativeMethods.GetDC(new HandleRef()));
+                var hdcDesktop = new HandleRef(null, InteropMethods.GetDC(new HandleRef()));
                 try
                 {
-                    var sysBitDepth = UnsafeNativeMethods.GetDeviceCaps(hdcDesktop, NativeMethods.BITSPIXEL);
-                    sysBitDepth *= UnsafeNativeMethods.GetDeviceCaps(hdcDesktop, NativeMethods.PLANES);
+                    var sysBitDepth = InteropMethods.GetDeviceCaps(hdcDesktop, InteropValues.BITSPIXEL);
+                    sysBitDepth *= InteropMethods.GetDeviceCaps(hdcDesktop, InteropValues.PLANES);
  
                     if (sysBitDepth == 8)
                     {
                         sysBitDepth = 4;
                     }
 
-                    var cxSmallIcon = UnsafeNativeMethods.GetSystemMetrics(SM.CXSMICON);
-                    var cySmallIcon = UnsafeNativeMethods.GetSystemMetrics(SM.CYSMICON);
-                    var cxIcon = UnsafeNativeMethods.GetSystemMetrics(SM.CXICON);
-                    var cyIcon = UnsafeNativeMethods.GetSystemMetrics(SM.CYICON);
+                    var cxSmallIcon = InteropMethods.GetSystemMetrics(InteropValues.SM.CXSMICON);
+                    var cySmallIcon = InteropMethods.GetSystemMetrics(InteropValues.SM.CYSMICON);
+                    var cxIcon = InteropMethods.GetSystemMetrics(InteropValues.SM.CXICON);
+                    var cyIcon = InteropMethods.GetSystemMetrics(InteropValues.SM.CYICON);
 
                     SmallIconSize = new Size(cxSmallIcon, cySmallIcon);
                     IconSize = new Size(cxIcon, cyIcon);
@@ -274,7 +274,7 @@ namespace HandyControl.Tools
                 }
                 finally
                 {
-                    UnsafeNativeMethods.ReleaseDC(new HandleRef(), hdcDesktop);
+                    InteropMethods.ReleaseDC(new HandleRef(), hdcDesktop);
                 }
             }
         }
@@ -287,8 +287,8 @@ namespace HandyControl.Tools
 
             SecurityHelper.DemandUIWindowPermission();
 
-            var iconModuleFile = UnsafeNativeMethods.GetModuleFileName(new HandleRef());
-            UnsafeNativeMethods.ExtractIconEx(iconModuleFile, 0, out largeIconHandle, out smallIconHandle, 1);
+            var iconModuleFile = InteropMethods.GetModuleFileName(new HandleRef());
+            InteropMethods.ExtractIconEx(iconModuleFile, 0, out largeIconHandle, out smallIconHandle, 1);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs
index c606d165..818df6bc 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs
@@ -19,7 +19,7 @@ namespace HandyControl.Tools
         /// <returns></returns>
         public static Window GetActiveWindow() => Application.Current.Windows.OfType<Window>().SingleOrDefault(x => x.IsActive);
 
-        private static readonly BitArray _cacheValid = new BitArray((int)CacheSlot.NumSlots);
+        private static readonly BitArray _cacheValid = new BitArray((int)InteropValues.CacheSlot.NumSlots);
 
         private static bool _setDpiX = true;
 
@@ -43,7 +43,7 @@ namespace HandyControl.Tools
                             var desktopWnd = new HandleRef(null, IntPtr.Zero);
 
                             // Win32Exception will get the Win32 error code so we don't have to
-                            var dc = UnsafeNativeMethods.GetDC(desktopWnd);
+                            var dc = InteropMethods.GetDC(desktopWnd);
 
                             // Detecting error case from unmanaged call, required by PREsharp to throw a Win32Exception
                             if (dc == IntPtr.Zero)
@@ -53,12 +53,12 @@ namespace HandyControl.Tools
 
                             try
                             {
-                                _dpi = UnsafeNativeMethods.GetDeviceCaps(new HandleRef(null, dc), NativeMethods.LOGPIXELSY);
+                                _dpi = InteropMethods.GetDeviceCaps(new HandleRef(null, dc), InteropValues.LOGPIXELSY);
                                 _dpiInitialized = true;
                             }
                             finally
                             {
-                                UnsafeNativeMethods.ReleaseDC(desktopWnd, new HandleRef(null, dc));
+                                InteropMethods.ReleaseDC(desktopWnd, new HandleRef(null, dc));
                             }
                         }
                     }
@@ -82,19 +82,19 @@ namespace HandyControl.Tools
                         {
                             _setDpiX = false;
                             var desktopWnd = new HandleRef(null, IntPtr.Zero);
-                            var dc = UnsafeNativeMethods.GetDC(desktopWnd);
+                            var dc = InteropMethods.GetDC(desktopWnd);
                             if (dc == IntPtr.Zero)
                             {
                                 throw new Win32Exception();
                             }
                             try
                             {
-                                _dpiX = UnsafeNativeMethods.GetDeviceCaps(new HandleRef(null, dc), NativeMethods.LOGPIXELSX);
-                                _cacheValid[(int)CacheSlot.DpiX] = true;
+                                _dpiX = InteropMethods.GetDeviceCaps(new HandleRef(null, dc), InteropValues.LOGPIXELSX);
+                                _cacheValid[(int)InteropValues.CacheSlot.DpiX] = true;
                             }
                             finally
                             {
-                                UnsafeNativeMethods.ReleaseDC(desktopWnd, new HandleRef(null, dc));
+                                InteropMethods.ReleaseDC(desktopWnd, new HandleRef(null, dc));
                             }
                         }
                     }
@@ -113,11 +113,11 @@ namespace HandyControl.Tools
             {
                 lock (_cacheValid)
                 {
-                    while (!_cacheValid[(int)CacheSlot.WindowResizeBorderThickness])
+                    while (!_cacheValid[(int)InteropValues.CacheSlot.WindowResizeBorderThickness])
                     {
-                        _cacheValid[(int)CacheSlot.WindowResizeBorderThickness] = true;
+                        _cacheValid[(int)InteropValues.CacheSlot.WindowResizeBorderThickness] = true;
 
-                        var frameSize = new Size(NativeMethods.GetSystemMetrics(SM.CXSIZEFRAME), NativeMethods.GetSystemMetrics(SM.CYSIZEFRAME));
+                        var frameSize = new Size(InteropMethods.GetSystemMetrics(InteropValues.SM.CXSIZEFRAME), InteropMethods.GetSystemMetrics(InteropValues.SM.CYSIZEFRAME));
                         var frameSizeInDips = DpiHelper.DeviceSizeToLogical(frameSize, DpiX / 96.0, Dpi / 96.0);
 
                         _windowResizeBorderThickness = new Thickness(frameSizeInDips.Width, frameSizeInDips.Height, frameSizeInDips.Width, frameSizeInDips.Height);
@@ -135,9 +135,9 @@ namespace HandyControl.Tools
 #if netle40
                 return WindowResizeBorderThickness;
 #elif Core
-                var hdc = UnsafeNativeMethods.GetDC(IntPtr.Zero);
-                var scale = UnsafeNativeMethods.GetDeviceCaps(hdc, NativeMethods.DESKTOPVERTRES) / (float)UnsafeNativeMethods.GetDeviceCaps(hdc, NativeMethods.VERTRES);
-                UnsafeNativeMethods.ReleaseDC(IntPtr.Zero, hdc);
+                var hdc = InteropMethods.GetDC(IntPtr.Zero);
+                var scale = InteropMethods.GetDeviceCaps(hdc, InteropValues.DESKTOPVERTRES) / (float)InteropMethods.GetDeviceCaps(hdc, InteropValues.VERTRES);
+                InteropMethods.ReleaseDC(IntPtr.Zero, hdc);
                 return WindowResizeBorderThickness.Add(new Thickness(4 * scale));
 #else
                 return WindowResizeBorderThickness.Add(new Thickness(4));
diff --git a/src/Shared/HandyControl_Shared/Tools/Hook/ClipboardHook.cs b/src/Shared/HandyControl_Shared/Tools/Hook/ClipboardHook.cs
index b98bb50a..61c9fc8f 100644
--- a/src/Shared/HandyControl_Shared/Tools/Hook/ClipboardHook.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Hook/ClipboardHook.cs
@@ -24,19 +24,19 @@ namespace HandyControl.Tools
             if (HWndSource != null)
             {
                 HWndSource.AddHook(WinProc);
-                NativeMethods.AddClipboardFormatListener(HookId);
+                InteropMethods.AddClipboardFormatListener(HookId);
             }
         }
 
         public static void Stop()
         {
             HWndSource.RemoveHook(WinProc);
-            NativeMethods.RemoveClipboardFormatListener(HookId);
+            InteropMethods.RemoveClipboardFormatListener(HookId);
         }
 
         private static IntPtr WinProc(IntPtr hwnd, int msg, IntPtr wparam, IntPtr lparam, ref bool handled)
         {
-            if (msg == NativeMethods.WM_CLIPBOARDUPDATE)
+            if (msg == InteropValues.WM_CLIPBOARDUPDATE)
             {
                 ContentChanged?.Invoke();
             }
diff --git a/src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs b/src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs
index 07ce92b6..58388c83 100644
--- a/src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs
@@ -14,17 +14,17 @@ namespace HandyControl.Tools
 
         private static IntPtr HookId = IntPtr.Zero;
 
-        private static readonly UnsafeNativeMethods.HookProc Proc = HookCallback;
+        private static readonly InteropValues.HookProc Proc = HookCallback;
 
         private static int VirtualKey;
 
-        private static readonly IntPtr KeyDownIntPtr = (IntPtr)NativeMethods.WM_KEYDOWN;
+        private static readonly IntPtr KeyDownIntPtr = (IntPtr)InteropValues.WM_KEYDOWN;
 
-        private static readonly IntPtr KeyUpIntPtr = (IntPtr)NativeMethods.WM_KEYUP;
+        private static readonly IntPtr KeyUpIntPtr = (IntPtr)InteropValues.WM_KEYUP;
 
-        private static readonly IntPtr SyskeyDownIntPtr = (IntPtr)NativeMethods.WM_SYSKEYDOWN;
+        private static readonly IntPtr SyskeyDownIntPtr = (IntPtr)InteropValues.WM_SYSKEYDOWN;
 
-        private static readonly IntPtr SyskeyUpIntPtr = (IntPtr)NativeMethods.WM_SYSKEYUP;
+        private static readonly IntPtr SyskeyUpIntPtr = (IntPtr)InteropValues.WM_SYSKEYUP;
 
         public static void Start()
         {
@@ -35,17 +35,17 @@ namespace HandyControl.Tools
             HookId = SetHook(Proc);
         }
 
-        public static void Stop() => UnsafeNativeMethods.UnhookWindowsHookEx(HookId);
+        public static void Stop() => InteropMethods.UnhookWindowsHookEx(HookId);
 
-        private static IntPtr SetHook(UnsafeNativeMethods.HookProc proc)
+        private static IntPtr SetHook(InteropValues.HookProc proc)
         {
             using (var curProcess = Process.GetCurrentProcess())
             using (var curModule = curProcess.MainModule)
             {
                 if (curModule != null)
                 {
-                    return UnsafeNativeMethods.SetWindowsHookEx((int)UnsafeNativeMethods.HookType.WH_KEYBOARD_LL, proc,
-                        UnsafeNativeMethods.GetModuleHandle(curModule.ModuleName), 0);
+                    return InteropMethods.SetWindowsHookEx((int)InteropValues.HookType.WH_KEYBOARD_LL, proc,
+                        InteropMethods.GetModuleHandle(curModule.ModuleName), 0);
                 }
                 return IntPtr.Zero;
             }
@@ -86,7 +86,7 @@ namespace HandyControl.Tools
                     KeyUp?.Invoke(null, new KeyboardHookEventArgs(virtualKey, true));
                 }
             }
-            return UnsafeNativeMethods.CallNextHookEx(HookId, nCode, wParam, lParam);
+            return InteropMethods.CallNextHookEx(HookId, nCode, wParam, lParam);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Hook/MouseHook.cs b/src/Shared/HandyControl_Shared/Tools/Hook/MouseHook.cs
index 5405c6cf..90b1f0d6 100644
--- a/src/Shared/HandyControl_Shared/Tools/Hook/MouseHook.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Hook/MouseHook.cs
@@ -12,7 +12,7 @@ namespace HandyControl.Tools
 
         private static IntPtr HookId = IntPtr.Zero;
 
-        private static readonly UnsafeNativeMethods.HookProc Proc = HookCallback;
+        private static readonly InteropValues.HookProc Proc = HookCallback;
 
         public static void Start()
         {
@@ -23,17 +23,17 @@ namespace HandyControl.Tools
             HookId = SetHook(Proc);
         }
 
-        public static void Stop() => UnsafeNativeMethods.UnhookWindowsHookEx(HookId);
+        public static void Stop() => InteropMethods.UnhookWindowsHookEx(HookId);
 
-        private static IntPtr SetHook(UnsafeNativeMethods.HookProc proc)
+        private static IntPtr SetHook(InteropValues.HookProc proc)
         {
             using (var curProcess = Process.GetCurrentProcess())
             using (var curModule = curProcess.MainModule)
             {
                 if (curModule != null)
                 {
-                    return UnsafeNativeMethods.SetWindowsHookEx((int) UnsafeNativeMethods.HookType.WH_MOUSE_LL, proc,
-                        UnsafeNativeMethods.GetModuleHandle(curModule.ModuleName), 0);
+                    return InteropMethods.SetWindowsHookEx((int)InteropValues.HookType.WH_MOUSE_LL, proc,
+                        InteropMethods.GetModuleHandle(curModule.ModuleName), 0);
                 }
                 return IntPtr.Zero;
             }
@@ -41,15 +41,15 @@ namespace HandyControl.Tools
 
         private static IntPtr HookCallback(int nCode, IntPtr wParam, IntPtr lParam)
         {
-            if (nCode < 0) return UnsafeNativeMethods.CallNextHookEx(HookId, nCode, wParam, lParam);
-            var hookStruct = (UnsafeNativeMethods.MOUSEHOOKSTRUCT)Marshal.PtrToStructure(lParam, typeof(UnsafeNativeMethods.MOUSEHOOKSTRUCT));
+            if (nCode < 0) return InteropMethods.CallNextHookEx(HookId, nCode, wParam, lParam);
+            var hookStruct = (InteropValues.MOUSEHOOKSTRUCT)Marshal.PtrToStructure(lParam, typeof(InteropValues.MOUSEHOOKSTRUCT));
             StatusChanged?.Invoke(null, new MouseHookEventArgs
             {
                 Message = (MouseHookMessageType)wParam,
-                Point = new NativeMethods.POINT(hookStruct.pt.X, hookStruct.pt.Y)
+                Point = new InteropValues.POINT(hookStruct.pt.X, hookStruct.pt.Y)
             });
 
-            return UnsafeNativeMethods.CallNextHookEx(HookId, nCode, wParam, lParam);
+            return InteropMethods.CallNextHookEx(HookId, nCode, wParam, lParam);
         }
     }
 }
diff --git a/src/Shared/HandyControl_Shared/Tools/Hook/SystemMenuHook.cs b/src/Shared/HandyControl_Shared/Tools/Hook/SystemMenuHook.cs
index afe6f66b..af10084f 100644
--- a/src/Shared/HandyControl_Shared/Tools/Hook/SystemMenuHook.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Hook/SystemMenuHook.cs
@@ -19,14 +19,14 @@ namespace HandyControl.Tools
             if (source != null)
             {
                 DataDic[id] = source;
-                NativeMethods.InsertMenu(NativeMethods.GetSystemMenu(hookId, false), index, NativeMethods.MF_BYPOSITION, id, text);
+                InteropMethods.InsertMenu(InteropMethods.GetSystemMenu(hookId, false), index, InteropValues.MF_BYPOSITION, id, text);
                 source.AddHook(WinProc);
             }
         }
 
-        public static void InsertSeperator(int index, Window window) => NativeMethods.InsertMenu(
-            NativeMethods.GetSystemMenu(window.GetHandle(), false), index,
-            NativeMethods.MF_BYPOSITION | NativeMethods.MF_SEPARATOR, 0, "");
+        public static void InsertSeperator(int index, Window window) => InteropMethods.InsertMenu(
+            InteropMethods.GetSystemMenu(window.GetHandle(), false), index,
+            InteropValues.MF_BYPOSITION | InteropValues.MF_SEPARATOR, 0, "");
 
         public static void Remove(int id)
         {
@@ -39,7 +39,7 @@ namespace HandyControl.Tools
 
         private static IntPtr WinProc(IntPtr hwnd, int msg, IntPtr wparam, IntPtr lparam, ref bool handled)
         {
-            if (msg == NativeMethods.WM_SYSCOMMAND)
+            if (msg == InteropValues.WM_SYSCOMMAND)
             {
                 var id = wparam.ToInt32();
                 if (DataDic.ContainsKey(id))
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/BITMAPINFO.cs b/src/Shared/HandyControl_Shared/Tools/Interop/BITMAPINFO.cs
deleted file mode 100644
index 4938fbdd..00000000
--- a/src/Shared/HandyControl_Shared/Tools/Interop/BITMAPINFO.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.InteropServices;
-using System.Security;
-
-namespace HandyControl.Tools.Interop
-{
-    [StructLayout(LayoutKind.Sequential, Pack = 2)]
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    internal struct BITMAPINFO
-    {
-        public int bmiHeader_biSize;
-
-        public int bmiHeader_biWidth;
-
-        public int bmiHeader_biHeight;
-
-        public short bmiHeader_biPlanes;
-
-        public short bmiHeader_biBitCount;
-
-        public int bmiHeader_biCompression;
-
-        public int bmiHeader_biSizeImage;
-
-        public int bmiHeader_biXPelsPerMeter;
-
-        public int bmiHeader_biYPelsPerMeter;
-
-        public int bmiHeader_biClrUsed;
-
-        public int bmiHeader_biClrImportant;
-
-        public BITMAPINFO(int width, int height, short bpp)
-        {
-            bmiHeader_biSize = SizeOf();
-            bmiHeader_biWidth = width;
-            bmiHeader_biHeight = height;
-            bmiHeader_biPlanes = 1;
-            bmiHeader_biBitCount = bpp;
-            bmiHeader_biCompression = 0;
-            bmiHeader_biSizeImage = 0;
-            bmiHeader_biXPelsPerMeter = 0;
-            bmiHeader_biYPelsPerMeter = 0;
-            bmiHeader_biClrUsed = 0;
-            bmiHeader_biClrImportant = 0;
-        }
-
-        [SecuritySafeCritical]
-        private static int SizeOf()
-        {
-            return Marshal.SizeOf(typeof(BITMAPINFO));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/ExternDll.cs b/src/Shared/HandyControl_Shared/Tools/Interop/ExternDll.cs
deleted file mode 100644
index 81fa0c71..00000000
--- a/src/Shared/HandyControl_Shared/Tools/Interop/ExternDll.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace HandyControl.Tools.Interop
-{
-    internal static class ExternDll
-    {
-        public const string
-            User32 = "user32.dll",
-            Gdi32 = "gdi32.dll",
-            Kernel32 = "kernel32.dll",
-            Shell32 = "shell32.dll";
-    }
-}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/BitmapHandle.cs b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/BitmapHandle.cs
similarity index 95%
rename from src/Shared/HandyControl_Shared/Tools/Interop/BitmapHandle.cs
rename to src/Shared/HandyControl_Shared/Tools/Interop/Handle/BitmapHandle.cs
index 1e893fa9..2fda6685 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/BitmapHandle.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/BitmapHandle.cs
@@ -24,7 +24,7 @@ namespace HandyControl.Tools.Interop
         [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         protected override bool ReleaseHandle()
         {
-            return UnsafeNativeMethods.DeleteObject(handle);
+            return InteropMethods.DeleteObject(handle);
         }
 
         [SecurityCritical]
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/CommonHandles.cs b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/CommonHandles.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Tools/Interop/CommonHandles.cs
rename to src/Shared/HandyControl_Shared/Tools/Interop/Handle/CommonHandles.cs
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/HandleCollector.cs b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/HandleCollector.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Tools/Interop/HandleCollector.cs
rename to src/Shared/HandyControl_Shared/Tools/Interop/Handle/HandleCollector.cs
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/IconHandle.cs b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/IconHandle.cs
similarity index 92%
rename from src/Shared/HandyControl_Shared/Tools/Interop/IconHandle.cs
rename to src/Shared/HandyControl_Shared/Tools/Interop/Handle/IconHandle.cs
index cbaec541..96de9b10 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/IconHandle.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/IconHandle.cs
@@ -15,7 +15,7 @@ namespace HandyControl.Tools.Interop
         [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         protected override bool ReleaseHandle()
         {
-            return UnsafeNativeMethods.DestroyIcon(handle);
+            return InteropMethods.DestroyIcon(handle);
         }
 
         [SecurityCritical, SecuritySafeCritical]
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/SafeFileMappingHandle.cs b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/SafeFileMappingHandle.cs
similarity index 95%
rename from src/Shared/HandyControl_Shared/Tools/Interop/SafeFileMappingHandle.cs
rename to src/Shared/HandyControl_Shared/Tools/Interop/Handle/SafeFileMappingHandle.cs
index ad26db90..c4aade37 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/SafeFileMappingHandle.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/SafeFileMappingHandle.cs
@@ -43,7 +43,7 @@ namespace HandyControl.Tools.Interop
         public static bool CloseHandleNoThrow(HandleRef handle)
         {
             HandleCollector.Remove((IntPtr)handle, CommonHandles.Kernel);
-            var result = UnsafeNativeMethods.IntCloseHandle(handle);
+            var result = InteropMethods.IntCloseHandle(handle);
             return result;
         }
     }
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/WpfSafeHandle.cs b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/WpfSafeHandle.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Tools/Interop/WpfSafeHandle.cs
rename to src/Shared/HandyControl_Shared/Tools/Interop/Handle/WpfSafeHandle.cs
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/ICONINFO.cs b/src/Shared/HandyControl_Shared/Tools/Interop/ICONINFO.cs
deleted file mode 100644
index 659c98e6..00000000
--- a/src/Shared/HandyControl_Shared/Tools/Interop/ICONINFO.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.InteropServices;
-
-namespace HandyControl.Tools.Interop
-{
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    internal class ICONINFO
-    {
-        public bool fIcon = false;
-        public int xHotspot = 0;
-        public int yHotspot = 0;
-        public BitmapHandle hbmMask = null;
-        public BitmapHandle hbmColor = null;
-    }
-}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs b/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs
new file mode 100644
index 00000000..965ad3c5
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs
@@ -0,0 +1,281 @@
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
+using System.Security;
+using System.Text;
+
+namespace HandyControl.Tools.Interop
+{
+    internal class InteropMethods
+    {
+        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
+        [ResourceExposure(ResourceScope.None)]
+        public static extern int RegisterWindowMessage(string msg);
+
+        [DllImport(InteropValues.ExternDll.User32, SetLastError = true, CharSet = CharSet.Auto)]
+        public static extern int MapWindowPoints(IntPtr hWndFrom, IntPtr hWndTo, ref InteropValues.RECT lpPoints, uint cPoints);
+
+        [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
+        public static extern bool ReadProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, out InteropValues.TBBUTTON lpBuffer,
+            int dwSize, out int lpNumberOfBytesRead);
+
+        [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true)]
+        public static extern bool ReadProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, out InteropValues.RECT lpBuffer,
+            int dwSize, out int lpNumberOfBytesRead);
+
+        [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true)]
+        public static extern bool ReadProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, out InteropValues.TRAYDATA lpBuffer,
+            int dwSize, out int lpNumberOfBytesRead);
+
+        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
+        public static extern uint SendMessage(IntPtr hWnd, uint Msg, uint wParam, IntPtr lParam);
+
+        [DllImport(InteropValues.ExternDll.User32, SetLastError = true, CharSet = CharSet.Auto)]
+        public static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
+
+        [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
+        public static extern IntPtr OpenProcess(InteropValues.ProcessAccess dwDesiredAccess,
+            [MarshalAs(UnmanagedType.Bool)] bool bInheritHandle, uint dwProcessId);
+
+        [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
+        public static extern IntPtr VirtualAllocEx(IntPtr hProcess, IntPtr lpAddress, int dwSize,
+            InteropValues.AllocationType flAllocationType, InteropValues.MemoryProtection flProtect);
+
+        [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
+        public static extern int CloseHandle(IntPtr hObject);
+
+        [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
+        public static extern bool VirtualFreeEx(IntPtr hProcess, IntPtr lpAddress, int dwSize, InteropValues.FreeType dwFreeType);
+
+        [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
+        public static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+        [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
+        public static extern IntPtr FindWindowEx(IntPtr hwndParent, IntPtr hwndChildAfter, string lpszClass,
+            string lpszWindow);
+
+        [DllImport(InteropValues.ExternDll.User32)]
+        public static extern int GetWindowRect(IntPtr hwnd, out InteropValues.RECT lpRect);
+
+        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
+        public static extern bool GetCursorPos(out InteropValues.POINT pt);
+
+        [DllImport(InteropValues.ExternDll.User32)]
+        public static extern IntPtr GetDesktopWindow();
+
+        [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool AddClipboardFormatListener(IntPtr hwnd);
+
+        [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool RemoveClipboardFormatListener(IntPtr hwnd);
+
+        [DllImport(InteropValues.ExternDll.User32)]
+        public static extern IntPtr GetSystemMenu(IntPtr hWnd, bool bRevert);
+
+        [DllImport(InteropValues.ExternDll.User32)]
+        public static extern bool InsertMenu(IntPtr hMenu, int wPosition, int wFlags, int wIDNewItem, string lpNewItem);
+
+        [SecurityCritical]
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(InteropValues.ExternDll.User32, SetLastError = true, ExactSpelling = true, EntryPoint = nameof(GetDC),
+            CharSet = CharSet.Auto)]
+        public static extern IntPtr IntGetDC(HandleRef hWnd);
+
+        [SecurityCritical]
+        public static IntPtr GetDC(HandleRef hWnd)
+        {
+            var hDc = IntGetDC(hWnd);
+            if (hDc == IntPtr.Zero) throw new Win32Exception();
+
+            return HandleCollector.Add(hDc, CommonHandles.HDC);
+        }
+
+        [SecurityCritical]
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(InteropValues.ExternDll.User32, ExactSpelling = true, EntryPoint = nameof(ReleaseDC), CharSet = CharSet.Auto)]
+        public static extern int IntReleaseDC(HandleRef hWnd, HandleRef hDC);
+
+        [SecurityCritical]
+        public static int ReleaseDC(HandleRef hWnd, HandleRef hDC)
+        {
+            HandleCollector.Remove((IntPtr) hDC, CommonHandles.HDC);
+            return IntReleaseDC(hWnd, hDC);
+        }
+
+        [SecurityCritical]
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto)]
+        public static extern int GetDeviceCaps(HandleRef hDC, int nIndex);
+
+        [SecurityCritical]
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(InteropValues.ExternDll.User32)]
+        public static extern int GetSystemMetrics(InteropValues.SM nIndex);
+
+        [SecurityCritical]
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(InteropValues.ExternDll.User32, EntryPoint = nameof(DestroyIcon), CharSet = CharSet.Auto, SetLastError = true)]
+        private static extern bool IntDestroyIcon(IntPtr hIcon);
+
+        [SecurityCritical]
+        public static bool DestroyIcon(IntPtr hIcon)
+        {
+            var result = IntDestroyIcon(hIcon);
+            return result;
+        }
+
+        [SecurityCritical]
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(InteropValues.ExternDll.Gdi32, EntryPoint = nameof(DeleteObject), CharSet = CharSet.Auto, SetLastError = true)]
+        private static extern bool IntDeleteObject(IntPtr hObject);
+
+        [SecurityCritical]
+        public static bool DeleteObject(IntPtr hObject)
+        {
+            var result = IntDeleteObject(hObject);
+            return result;
+        }
+
+        [SecurityCritical]
+        public static BitmapHandle CreateDIBSection(HandleRef hdc, ref InteropValues.BITMAPINFO bitmapInfo, int iUsage,
+            ref IntPtr ppvBits, SafeFileMappingHandle hSection, int dwOffset)
+        {
+            if (hSection == null) hSection = new SafeFileMappingHandle(IntPtr.Zero);
+
+            var hBitmap = PrivateCreateDIBSection(hdc, ref bitmapInfo, iUsage, ref ppvBits, hSection, dwOffset);
+            return hBitmap;
+        }
+
+        [DllImport(InteropValues.ExternDll.Kernel32, EntryPoint = "CloseHandle", CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern bool IntCloseHandle(HandleRef handle);
+
+        [SecurityCritical]
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto,
+            EntryPoint = nameof(CreateDIBSection))]
+        private static extern BitmapHandle PrivateCreateDIBSection(HandleRef hdc, ref InteropValues.BITMAPINFO bitmapInfo, int iUsage,
+            ref IntPtr ppvBits, SafeFileMappingHandle hSection, int dwOffset);
+
+        [SecurityCritical]
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(InteropValues.ExternDll.User32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto,
+            EntryPoint = nameof(CreateIconIndirect))]
+        private static extern IconHandle PrivateCreateIconIndirect([In] [MarshalAs(UnmanagedType.LPStruct)]
+            InteropValues.ICONINFO iconInfo);
+
+        [SecurityCritical]
+        public static IconHandle CreateIconIndirect([In] [MarshalAs(UnmanagedType.LPStruct)]
+            InteropValues.ICONINFO iconInfo)
+        {
+            var hIcon = PrivateCreateIconIndirect(iconInfo);
+            return hIcon;
+        }
+
+        [SecurityCritical]
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto,
+            EntryPoint = nameof(CreateBitmap))]
+        private static extern BitmapHandle PrivateCreateBitmap(int width, int height, int planes, int bitsPerPixel,
+            byte[] lpvBits);
+
+        [SecurityCritical]
+        internal static BitmapHandle CreateBitmap(int width, int height, int planes, int bitsPerPixel, byte[] lpvBits)
+        {
+            var hBitmap = PrivateCreateBitmap(width, height, planes, bitsPerPixel, lpvBits);
+            return hBitmap;
+        }
+
+        [SecurityCritical]
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(InteropValues.ExternDll.Kernel32, EntryPoint = "GetModuleFileName", CharSet = CharSet.Unicode,
+            SetLastError = true)]
+        private static extern int IntGetModuleFileName(HandleRef hModule, StringBuilder buffer, int length);
+
+        [SecurityCritical]
+        internal static string GetModuleFileName(HandleRef hModule)
+        {
+            var buffer = new StringBuilder(InteropValues.Win32Constant.MAX_PATH);
+            while (true)
+            {
+                var size = IntGetModuleFileName(hModule, buffer, buffer.Capacity);
+                if (size == 0) throw new Win32Exception();
+
+                if (size == buffer.Capacity)
+                {
+                    buffer.EnsureCapacity(buffer.Capacity * 2);
+                    continue;
+                }
+
+                return buffer.ToString();
+            }
+        }
+
+        [SecurityCritical]
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(InteropValues.ExternDll.Shell32, CharSet = CharSet.Auto, BestFitMapping = false, ThrowOnUnmappableChar = true)]
+        internal static extern int ExtractIconEx(string szExeFileName, int nIconIndex, out IconHandle phiconLarge,
+            out IconHandle phiconSmall, int nIcons);
+
+        [DllImport(InteropValues.ExternDll.Shell32, CharSet = CharSet.Auto)]
+        public static extern int Shell_NotifyIcon(int message, InteropValues.NOTIFYICONDATA pnid);
+
+        [SecurityCritical]
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport(InteropValues.ExternDll.User32, SetLastError = true, CharSet = CharSet.Unicode, EntryPoint = "CreateWindowExW")]
+        public static extern IntPtr CreateWindowEx(
+            int dwExStyle,
+            [MarshalAs(UnmanagedType.LPWStr)] string lpClassName,
+            [MarshalAs(UnmanagedType.LPWStr)] string lpWindowName,
+            int dwStyle,
+            int x,
+            int y,
+            int nWidth,
+            int nHeight,
+            IntPtr hWndParent,
+            IntPtr hMenu,
+            IntPtr hInstance,
+            IntPtr lpParam);
+
+        [SecurityCritical]
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Unicode, SetLastError = true, BestFitMapping = false)]
+        public static extern short RegisterClass(InteropValues.WNDCLASS wc);
+
+        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
+        public static extern IntPtr DefWindowProc(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
+
+        [DllImport(InteropValues.ExternDll.User32, ExactSpelling = true, CharSet = CharSet.Auto)]
+        public static extern bool SetForegroundWindow(IntPtr hWnd);
+
+        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern IntPtr CallNextHookEx(IntPtr hhk, int nCode, IntPtr wParam, IntPtr lParam);
+
+        [DllImport(InteropValues.ExternDll.Kernel32, CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern IntPtr GetModuleHandle(string lpModuleName);
+
+        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern bool UnhookWindowsHookEx(IntPtr hhk);
+
+        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern IntPtr SetWindowsHookEx(int idHook, InteropValues.HookProc lpfn, IntPtr hMod, uint dwThreadId);
+
+        [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
+        public static extern IntPtr GetWindowDC(IntPtr window);
+
+        [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true)]
+        public static extern uint GetPixel(IntPtr dc, int x, int y);
+
+        [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
+        public static extern int ReleaseDC(IntPtr window, IntPtr dc);
+
+        [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto)]
+        public static extern int GetDeviceCaps(IntPtr hdc, int nIndex);
+
+        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
+        public static extern IntPtr GetDC(IntPtr ptr);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs b/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
new file mode 100644
index 00000000..dc2c7cd0
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
@@ -0,0 +1,532 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Security;
+
+namespace HandyControl.Tools.Interop
+{
+    public class InteropValues
+    {
+        #region public
+
+        public delegate IntPtr HookProc(int code, IntPtr wParam, IntPtr lParam);
+
+        public delegate IntPtr WndProc(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
+
+        public const int
+            WS_CHILD = 0x40000000,
+            BITSPIXEL = 12,
+            PLANES = 14,
+            BI_RGB = 0,
+            DIB_RGB_COLORS = 0,
+            NIF_MESSAGE = 0x00000001,
+            NIF_ICON = 0x00000002,
+            NIF_TIP = 0x00000004,
+            NIF_INFO = 0x00000010,
+            NIN_BALLOONSHOW = WM_USER + 2,
+            NIN_BALLOONHIDE = WM_USER + 3,
+            NIN_BALLOONTIMEOUT = WM_USER + 4,
+            NIM_ADD = 0x00000000,
+            NIM_MODIFY = 0x00000001,
+            NIM_DELETE = 0x00000002,
+            NIIF_NONE = 0x00000000,
+            NIIF_INFO = 0x00000001,
+            NIIF_WARNING = 0x00000002,
+            NIIF_ERROR = 0x00000003,
+            NIIF_LARGE_ICON = 0x00000020,
+            WM_KEYDOWN = 0x0100,
+            WM_KEYUP = 0x0101,
+            WM_SYSKEYDOWN = 0x0104,
+            WM_SYSKEYUP = 0x0105,
+            WM_SYSCOMMAND = 0x112,
+            WM_MOUSEMOVE = 0x0200,
+            WM_LBUTTONDOWN = 0x0201,
+            WM_LBUTTONUP = 0x0202,
+            WM_LBUTTONDBLCLK = 0x0203,
+            WM_RBUTTONDOWN = 0x0204,
+            WM_RBUTTONUP = 0x0205,
+            WM_RBUTTONDBLCLK = 0x0206,
+            WM_MBUTTONDOWN = 0x0207,
+            WM_MBUTTONUP = 0x0208,
+            WM_MBUTTONDBLCLK = 0x0209,
+            WM_CLIPBOARDUPDATE = 0x031D,
+            WM_USER = 0x0400,
+            MF_BYPOSITION = 0x400,
+            MF_SEPARATOR = 0x800,
+            TB_GETBUTTON = WM_USER + 23,
+            TB_BUTTONCOUNT = WM_USER + 24,
+            TB_GETITEMRECT = WM_USER + 29,
+            STANDARD_RIGHTS_REQUIRED = 0x000F0000,
+            SYNCHRONIZE = 0x00100000,
+            PROCESS_ALL_ACCESS = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0xFFF,
+            MEM_COMMIT = 0x1000,
+            MEM_RELEASE = 0x8000,
+            PAGE_READWRITE = 0x04,
+            TBSTATE_HIDDEN = 0x08,
+            VERTRES = 10,
+            HORZRES = 8,
+            DESKTOPVERTRES = 117,
+            DESKTOPHORZRES = 118,
+            LOGPIXELSX = 88,
+            LOGPIXELSY = 90,
+            CXFRAME = 32,
+            CXSIZEFRAME = CXFRAME,
+            SW_HIDE = 0;
+
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+        public class NOTIFYICONDATA
+        {
+            public int cbSize = Marshal.SizeOf(typeof(NOTIFYICONDATA));
+            public IntPtr hWnd;
+            public int uID;
+            public int uFlags;
+            public int uCallbackMessage;
+            public IntPtr hIcon;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
+            public string szTip = string.Empty;
+            public int dwState = 0x01;
+            public int dwStateMask = 0x01;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+            public string szInfo = string.Empty;
+            public int uTimeoutOrVersion;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 64)]
+            public string szInfoTitle = string.Empty;
+            public int dwInfoFlags;
+        }
+
+        [Flags]
+        public enum ProcessAccess
+        {
+            AllAccess = CreateThread | DuplicateHandle | QueryInformation | SetInformation | Terminate | VMOperation | VMRead | VMWrite | Synchronize,
+            CreateThread = 0x2,
+            DuplicateHandle = 0x40,
+            QueryInformation = 0x400,
+            SetInformation = 0x200,
+            Terminate = 0x1,
+            VMOperation = 0x8,
+            VMRead = 0x10,
+            VMWrite = 0x20,
+            Synchronize = 0x100000
+        }
+
+        [Serializable, StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+        public struct RECT
+        {
+            public int Left;
+            public int Top;
+            public int Right;
+            public int Bottom;
+
+            public RECT(int left, int top, int right, int bottom)
+            {
+                Left = left;
+                Top = top;
+                Right = right;
+                Bottom = bottom;
+            }
+        }
+
+        [StructLayout(LayoutKind.Sequential, Pack = 1)]
+        public struct TBBUTTON
+        {
+            public int iBitmap;
+            public int idCommand;
+            public IntPtr fsStateStylePadding;
+            public IntPtr dwData;
+            public IntPtr iString;
+        }
+
+        [Flags]
+        public enum AllocationType
+        {
+            Commit = 0x1000,
+            Reserve = 0x2000,
+            Decommit = 0x4000,
+            Release = 0x8000,
+            Reset = 0x80000,
+            Physical = 0x400000,
+            TopDown = 0x100000,
+            WriteWatch = 0x200000,
+            LargePages = 0x20000000
+        }
+
+        [Flags]
+        public enum MemoryProtection
+        {
+            Execute = 0x10,
+            ExecuteRead = 0x20,
+            ExecuteReadWrite = 0x40,
+            ExecuteWriteCopy = 0x80,
+            NoAccess = 0x01,
+            ReadOnly = 0x02,
+            ReadWrite = 0x04,
+            WriteCopy = 0x08,
+            GuardModifierflag = 0x100,
+            NoCacheModifierflag = 0x200,
+            WriteCombineModifierflag = 0x400
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct TRAYDATA
+        {
+            public IntPtr hwnd;
+            public uint uID;
+            public uint uCallbackMessage;
+            public uint bReserved0;
+            public uint bReserved1;
+            public IntPtr hIcon;
+        }
+
+        [Flags]
+        public enum FreeType
+        {
+            Decommit = 0x4000,
+            Release = 0x8000,
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct POINT
+        {
+            public int X;
+            public int Y;
+
+            public POINT(int x, int y)
+            {
+                X = x;
+                Y = y;
+            }
+        }
+
+        public enum HookType
+        {
+            WH_KEYBOARD_LL = 13,
+            WH_MOUSE_LL = 14
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct MOUSEHOOKSTRUCT
+        {
+            public POINT pt;
+            public IntPtr hwnd;
+            public uint wHitTestCode;
+            public IntPtr dwExtraInfo;
+        }
+
+        #endregion
+
+        #region internal
+
+        internal static class ExternDll
+        {
+            public const string
+                User32 = "user32.dll",
+                Gdi32 = "gdi32.dll",
+                Kernel32 = "kernel32.dll",
+                Shell32 = "shell32.dll";
+        }
+
+        internal enum SM
+        {
+            CXSCREEN = 0,
+            CYSCREEN = 1,
+            CXVSCROLL = 2,
+            CYHSCROLL = 3,
+            CYCAPTION = 4,
+            CXBORDER = 5,
+            CYBORDER = 6,
+            CXFIXEDFRAME = 7,
+            CYFIXEDFRAME = 8,
+            CYVTHUMB = 9,
+            CXHTHUMB = 10,
+            CXICON = 11,
+            CYICON = 12,
+            CXCURSOR = 13,
+            CYCURSOR = 14,
+            CYMENU = 15,
+            CXFULLSCREEN = 16,
+            CYFULLSCREEN = 17,
+            CYKANJIWINDOW = 18,
+            MOUSEPRESENT = 19,
+            CYVSCROLL = 20,
+            CXHSCROLL = 21,
+            DEBUG = 22,
+            SWAPBUTTON = 23,
+            CXMIN = 28,
+            CYMIN = 29,
+            CXSIZE = 30,
+            CYSIZE = 31,
+            CXFRAME = 32,
+            CXSIZEFRAME = CXFRAME,
+            CYFRAME = 33,
+            CYSIZEFRAME = CYFRAME,
+            CXMINTRACK = 34,
+            CYMINTRACK = 35,
+            CXDOUBLECLK = 36,
+            CYDOUBLECLK = 37,
+            CXICONSPACING = 38,
+            CYICONSPACING = 39,
+            MENUDROPALIGNMENT = 40,
+            PENWINDOWS = 41,
+            DBCSENABLED = 42,
+            CMOUSEBUTTONS = 43,
+            SECURE = 44,
+            CXEDGE = 45,
+            CYEDGE = 46,
+            CXMINSPACING = 47,
+            CYMINSPACING = 48,
+            CXSMICON = 49,
+            CYSMICON = 50,
+            CYSMCAPTION = 51,
+            CXSMSIZE = 52,
+            CYSMSIZE = 53,
+            CXMENUSIZE = 54,
+            CYMENUSIZE = 55,
+            ARRANGE = 56,
+            CXMINIMIZED = 57,
+            CYMINIMIZED = 58,
+            CXMAXTRACK = 59,
+            CYMAXTRACK = 60,
+            CXMAXIMIZED = 61,
+            CYMAXIMIZED = 62,
+            NETWORK = 63,
+            CLEANBOOT = 67,
+            CXDRAG = 68,
+            CYDRAG = 69,
+            SHOWSOUNDS = 70,
+            CXMENUCHECK = 71,
+            CYMENUCHECK = 72,
+            SLOWMACHINE = 73,
+            MIDEASTENABLED = 74,
+            MOUSEWHEELPRESENT = 75,
+            XVIRTUALSCREEN = 76,
+            YVIRTUALSCREEN = 77,
+            CXVIRTUALSCREEN = 78,
+            CYVIRTUALSCREEN = 79,
+            CMONITORS = 80,
+            SAMEDISPLAYFORMAT = 81,
+            IMMENABLED = 82,
+            CXFOCUSBORDER = 83,
+            CYFOCUSBORDER = 84,
+            TABLETPC = 86,
+            MEDIACENTER = 87,
+            REMOTESESSION = 0x1000,
+            REMOTECONTROL = 0x2001
+        }
+
+        internal enum CacheSlot
+        {
+            DpiX,
+
+            FocusBorderWidth,
+            FocusBorderHeight,
+            HighContrast,
+            MouseVanish,
+
+            DropShadow,
+            FlatMenu,
+            WorkAreaInternal,
+            WorkArea,
+
+            IconMetrics,
+
+            KeyboardCues,
+            KeyboardDelay,
+            KeyboardPreference,
+            KeyboardSpeed,
+            SnapToDefaultButton,
+            WheelScrollLines,
+            MouseHoverTime,
+            MouseHoverHeight,
+            MouseHoverWidth,
+
+            MenuDropAlignment,
+            MenuFade,
+            MenuShowDelay,
+
+            ComboBoxAnimation,
+            ClientAreaAnimation,
+            CursorShadow,
+            GradientCaptions,
+            HotTracking,
+            ListBoxSmoothScrolling,
+            MenuAnimation,
+            SelectionFade,
+            StylusHotTracking,
+            ToolTipAnimation,
+            ToolTipFade,
+            UIEffects,
+
+            MinimizeAnimation,
+            Border,
+            CaretWidth,
+            ForegroundFlashCount,
+            DragFullWindows,
+            NonClientMetrics,
+
+            ThinHorizontalBorderHeight,
+            ThinVerticalBorderWidth,
+            CursorWidth,
+            CursorHeight,
+            ThickHorizontalBorderHeight,
+            ThickVerticalBorderWidth,
+            MinimumHorizontalDragDistance,
+            MinimumVerticalDragDistance,
+            FixedFrameHorizontalBorderHeight,
+            FixedFrameVerticalBorderWidth,
+            FocusHorizontalBorderHeight,
+            FocusVerticalBorderWidth,
+            FullPrimaryScreenWidth,
+            FullPrimaryScreenHeight,
+            HorizontalScrollBarButtonWidth,
+            HorizontalScrollBarHeight,
+            HorizontalScrollBarThumbWidth,
+            IconWidth,
+            IconHeight,
+            IconGridWidth,
+            IconGridHeight,
+            MaximizedPrimaryScreenWidth,
+            MaximizedPrimaryScreenHeight,
+            MaximumWindowTrackWidth,
+            MaximumWindowTrackHeight,
+            MenuCheckmarkWidth,
+            MenuCheckmarkHeight,
+            MenuButtonWidth,
+            MenuButtonHeight,
+            MinimumWindowWidth,
+            MinimumWindowHeight,
+            MinimizedWindowWidth,
+            MinimizedWindowHeight,
+            MinimizedGridWidth,
+            MinimizedGridHeight,
+            MinimumWindowTrackWidth,
+            MinimumWindowTrackHeight,
+            PrimaryScreenWidth,
+            PrimaryScreenHeight,
+            WindowCaptionButtonWidth,
+            WindowCaptionButtonHeight,
+            ResizeFrameHorizontalBorderHeight,
+            ResizeFrameVerticalBorderWidth,
+            SmallIconWidth,
+            SmallIconHeight,
+            SmallWindowCaptionButtonWidth,
+            SmallWindowCaptionButtonHeight,
+            VirtualScreenWidth,
+            VirtualScreenHeight,
+            VerticalScrollBarWidth,
+            VerticalScrollBarButtonHeight,
+            WindowCaptionHeight,
+            KanjiWindowHeight,
+            MenuBarHeight,
+            VerticalScrollBarThumbHeight,
+            IsImmEnabled,
+            IsMediaCenter,
+            IsMenuDropRightAligned,
+            IsMiddleEastEnabled,
+            IsMousePresent,
+            IsMouseWheelPresent,
+            IsPenWindows,
+            IsRemotelyControlled,
+            IsRemoteSession,
+            ShowSounds,
+            IsSlowMachine,
+            SwapButtons,
+            IsTabletPC,
+            VirtualScreenLeft,
+            VirtualScreenTop,
+
+            PowerLineStatus,
+
+            IsGlassEnabled,
+            UxThemeName,
+            UxThemeColor,
+            WindowCornerRadius,
+            WindowGlassColor,
+            WindowGlassBrush,
+            WindowNonClientFrameThickness,
+            WindowResizeBorderThickness,
+
+            NumSlots
+        }
+
+        internal static class Win32Constant
+        {
+            internal const int MAX_PATH = 260;
+            internal const int INFOTIPSIZE = 1024;
+            internal const int TRUE = 1;
+            internal const int FALSE = 0;
+        }
+
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+        internal class WNDCLASS
+        {
+            public int style;
+            public WndProc lpfnWndProc;
+            public int cbClsExtra;
+            public int cbWndExtra;
+            public IntPtr hInstance;
+            public IntPtr hIcon;
+            public IntPtr hCursor;
+            public IntPtr hbrBackground;
+            public string lpszMenuName;
+            public string lpszClassName;
+        }
+
+        [StructLayout(LayoutKind.Sequential, Pack = 2)]
+        internal struct BITMAPINFO
+        {
+            public int bmiHeader_biSize;
+
+            public int bmiHeader_biWidth;
+
+            public int bmiHeader_biHeight;
+
+            public short bmiHeader_biPlanes;
+
+            public short bmiHeader_biBitCount;
+
+            public int bmiHeader_biCompression;
+
+            public int bmiHeader_biSizeImage;
+
+            public int bmiHeader_biXPelsPerMeter;
+
+            public int bmiHeader_biYPelsPerMeter;
+
+            public int bmiHeader_biClrUsed;
+
+            public int bmiHeader_biClrImportant;
+
+            public BITMAPINFO(int width, int height, short bpp)
+            {
+                bmiHeader_biSize = SizeOf();
+                bmiHeader_biWidth = width;
+                bmiHeader_biHeight = height;
+                bmiHeader_biPlanes = 1;
+                bmiHeader_biBitCount = bpp;
+                bmiHeader_biCompression = 0;
+                bmiHeader_biSizeImage = 0;
+                bmiHeader_biXPelsPerMeter = 0;
+                bmiHeader_biYPelsPerMeter = 0;
+                bmiHeader_biClrUsed = 0;
+                bmiHeader_biClrImportant = 0;
+            }
+
+            [SecuritySafeCritical]
+            private static int SizeOf()
+            {
+                return Marshal.SizeOf(typeof(BITMAPINFO));
+            }
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal class ICONINFO
+        {
+            public bool fIcon = false;
+            public int xHotspot = 0;
+            public int yHotspot = 0;
+            public BitmapHandle hbmMask = null;
+            public BitmapHandle hbmColor = null;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/NOTIFYICONDATA.cs b/src/Shared/HandyControl_Shared/Tools/Interop/NOTIFYICONDATA.cs
deleted file mode 100644
index c57d604a..00000000
--- a/src/Shared/HandyControl_Shared/Tools/Interop/NOTIFYICONDATA.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.InteropServices;
-
-namespace HandyControl.Tools.Interop
-{
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public class NOTIFYICONDATA
-    {
-        public int cbSize = Marshal.SizeOf(typeof(NOTIFYICONDATA));
-        public IntPtr hWnd;
-        public int uID;
-        public int uFlags;
-        public int uCallbackMessage;
-        public IntPtr hIcon;
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
-        public string szTip = string.Empty;
-        public int dwState = 0x01;
-        public int dwStateMask = 0x01;
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
-        public string szInfo = string.Empty;
-        public int uTimeoutOrVersion;
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 64)]
-        public string szInfoTitle = string.Empty;
-        public int dwInfoFlags;
-    }
-}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/NativeMethods.cs b/src/Shared/HandyControl_Shared/Tools/Interop/NativeMethods.cs
deleted file mode 100644
index b4885c5f..00000000
--- a/src/Shared/HandyControl_Shared/Tools/Interop/NativeMethods.cs
+++ /dev/null
@@ -1,246 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
-using System.Security;
-
-namespace HandyControl.Tools.Interop
-{
-    public delegate IntPtr WndProc(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
-
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    [SuppressMessage("ReSharper", "IdentifierTypo")]
-    internal class NativeMethods
-    {
-        public const int
-            WS_CHILD = 0x40000000,
-            BITSPIXEL = 12,
-            PLANES = 14,
-            BI_RGB = 0,
-            DIB_RGB_COLORS = 0,
-            NIF_MESSAGE = 0x00000001,
-            NIF_ICON = 0x00000002,
-            NIF_TIP = 0x00000004,
-            NIF_INFO = 0x00000010,
-            NIN_BALLOONSHOW = WM_USER + 2,
-            NIN_BALLOONHIDE = WM_USER + 3,
-            NIN_BALLOONTIMEOUT = WM_USER + 4,
-            NIM_ADD = 0x00000000,
-            NIM_MODIFY = 0x00000001,
-            NIM_DELETE = 0x00000002,
-            NIIF_NONE = 0x00000000,
-            NIIF_INFO = 0x00000001,
-            NIIF_WARNING = 0x00000002,
-            NIIF_ERROR = 0x00000003,
-            NIIF_LARGE_ICON = 0x00000020,
-            WM_KEYDOWN = 0x0100,
-            WM_KEYUP = 0x0101,
-            WM_SYSKEYDOWN = 0x0104,
-            WM_SYSKEYUP = 0x0105,
-            WM_SYSCOMMAND = 0x112,
-            WM_MOUSEMOVE = 0x0200,
-            WM_LBUTTONDOWN = 0x0201,
-            WM_LBUTTONUP = 0x0202,
-            WM_LBUTTONDBLCLK = 0x0203,
-            WM_RBUTTONDOWN = 0x0204,
-            WM_RBUTTONUP = 0x0205,
-            WM_RBUTTONDBLCLK = 0x0206,
-            WM_MBUTTONDOWN = 0x0207,
-            WM_MBUTTONUP = 0x0208,
-            WM_MBUTTONDBLCLK = 0x0209,
-            WM_CLIPBOARDUPDATE = 0x031D,
-            WM_USER = 0x0400,
-            MF_BYPOSITION = 0x400,
-            MF_SEPARATOR = 0x800,
-            TB_GETBUTTON = WM_USER + 23,
-            TB_BUTTONCOUNT = WM_USER + 24,
-            TB_GETITEMRECT = WM_USER + 29,
-            STANDARD_RIGHTS_REQUIRED = 0x000F0000,
-            SYNCHRONIZE = 0x00100000,
-            PROCESS_ALL_ACCESS = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0xFFF,
-            MEM_COMMIT = 0x1000,
-            MEM_RELEASE = 0x8000,
-            PAGE_READWRITE = 0x04,
-            TBSTATE_HIDDEN = 0x08,
-            VERTRES = 10,
-            HORZRES = 8,
-            DESKTOPVERTRES = 117,
-            DESKTOPHORZRES = 118,
-            LOGPIXELSX = 88,
-            LOGPIXELSY = 90,
-            CXFRAME = 32,
-            CXSIZEFRAME = CXFRAME,
-            SW_HIDE = 0;
-
-        [Flags]
-        public enum ProcessAccess
-        {
-            AllAccess = CreateThread | DuplicateHandle | QueryInformation | SetInformation | Terminate | VMOperation | VMRead | VMWrite | Synchronize,
-            CreateThread = 0x2,
-            DuplicateHandle = 0x40,
-            QueryInformation = 0x400,
-            SetInformation = 0x200,
-            Terminate = 0x1,
-            VMOperation = 0x8,
-            VMRead = 0x10,
-            VMWrite = 0x20,
-            Synchronize = 0x100000
-        }
-
-        [Serializable, StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-        public struct RECT
-        {
-            public int Left;
-            public int Top;
-            public int Right;
-            public int Bottom;
-
-            public RECT(int left, int top, int right, int bottom)
-            {
-                Left = left;
-                Top = top;
-                Right = right;
-                Bottom = bottom;
-            }
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        public struct TBBUTTON
-        {
-            public int iBitmap;
-            public int idCommand;
-            public IntPtr fsStateStylePadding;
-            public IntPtr dwData;
-            public IntPtr iString;
-        }
-
-        [Flags]
-        public enum AllocationType
-        {
-            Commit = 0x1000,
-            Reserve = 0x2000,
-            Decommit = 0x4000,
-            Release = 0x8000,
-            Reset = 0x80000,
-            Physical = 0x400000,
-            TopDown = 0x100000,
-            WriteWatch = 0x200000,
-            LargePages = 0x20000000
-        }
-
-        [Flags]
-        public enum MemoryProtection
-        {
-            Execute = 0x10,
-            ExecuteRead = 0x20,
-            ExecuteReadWrite = 0x40,
-            ExecuteWriteCopy = 0x80,
-            NoAccess = 0x01,
-            ReadOnly = 0x02,
-            ReadWrite = 0x04,
-            WriteCopy = 0x08,
-            GuardModifierflag = 0x100,
-            NoCacheModifierflag = 0x200,
-            WriteCombineModifierflag = 0x400
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        public struct TRAYDATA
-        {
-            public IntPtr hwnd;
-            public uint uID;
-            public uint uCallbackMessage;
-            public uint bReserved0;
-            public uint bReserved1;
-            public IntPtr hIcon;
-        }
-
-        [Flags]
-        public enum FreeType
-        {
-            Decommit = 0x4000,
-            Release = 0x8000,
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        public struct POINT
-        {
-            public int X;
-            public int Y;
-
-            public POINT(int x, int y)
-            {
-                X = x;
-                Y = y;
-            }
-        }
-
-        [DllImport(ExternDll.User32, CharSet = CharSet.Auto)]
-        [ResourceExposure(ResourceScope.None)]
-        public static extern int RegisterWindowMessage(string msg);
-
-        [DllImport(ExternDll.User32, SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern int MapWindowPoints(IntPtr hWndFrom, IntPtr hWndTo, ref RECT lpPoints, uint cPoints);
-
-        [DllImport(ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern bool ReadProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, out TBBUTTON lpBuffer, int dwSize, out int lpNumberOfBytesRead);
-
-        [DllImport(ExternDll.Kernel32, SetLastError = true)]
-        public static extern bool ReadProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, out RECT lpBuffer, int dwSize, out int lpNumberOfBytesRead);
-
-        [DllImport(ExternDll.Kernel32, SetLastError = true)]
-        public static extern bool ReadProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, out TRAYDATA lpBuffer, int dwSize, out int lpNumberOfBytesRead);
-
-        [DllImport(ExternDll.User32, CharSet = CharSet.Auto)]
-        public static extern uint SendMessage(IntPtr hWnd, uint Msg, uint wParam, IntPtr lParam);
-
-        [DllImport(ExternDll.User32, SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
-
-        [DllImport(ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern IntPtr OpenProcess(ProcessAccess dwDesiredAccess, [MarshalAs(UnmanagedType.Bool)] bool bInheritHandle, uint dwProcessId);
-
-        [DllImport(ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern IntPtr VirtualAllocEx(IntPtr hProcess, IntPtr lpAddress, int dwSize, AllocationType flAllocationType, MemoryProtection flProtect);
-
-        [DllImport(ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern int CloseHandle(IntPtr hObject);
-
-        [DllImport(ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern bool VirtualFreeEx(IntPtr hProcess, IntPtr lpAddress, int dwSize, FreeType dwFreeType);
-
-        [DllImport(ExternDll.User32, SetLastError = true)]
-        public static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
-
-        [DllImport(ExternDll.User32, SetLastError = true)]
-        public static extern IntPtr FindWindowEx(IntPtr hwndParent, IntPtr hwndChildAfter, string lpszClass, string lpszWindow);
-
-        [DllImport(ExternDll.User32)]
-        public static extern int GetWindowRect(IntPtr hwnd, out RECT lpRect);
-
-        [DllImport(ExternDll.User32, CharSet = CharSet.Auto)]
-        public static extern bool GetCursorPos(out POINT pt);
-
-        [SecurityCritical]
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport(ExternDll.User32)]
-        public static extern int GetSystemMetrics(SM nIndex);
-
-        [DllImport(ExternDll.User32)]
-        public static extern IntPtr GetDesktopWindow();
-
-        [DllImport(ExternDll.User32, SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool AddClipboardFormatListener(IntPtr hwnd);
-
-        [DllImport(ExternDll.User32, SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool RemoveClipboardFormatListener(IntPtr hwnd);
-
-        [DllImport(ExternDll.User32)]
-        public static extern IntPtr GetSystemMenu(IntPtr hWnd, bool bRevert);
-
-        [DllImport(ExternDll.User32)]
-        public static extern bool InsertMenu(IntPtr hMenu, int wPosition, int wFlags, int wIDNewItem, string lpNewItem);
-    }
-}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/NativeValues.cs b/src/Shared/HandyControl_Shared/Tools/Interop/NativeValues.cs
deleted file mode 100644
index 94c1e09b..00000000
--- a/src/Shared/HandyControl_Shared/Tools/Interop/NativeValues.cs
+++ /dev/null
@@ -1,235 +0,0 @@
-// ReSharper disable InconsistentNaming
-
-namespace HandyControl.Tools.Interop
-{
-    internal enum SM
-    {
-        CXSCREEN = 0,
-        CYSCREEN = 1,
-        CXVSCROLL = 2,
-        CYHSCROLL = 3,
-        CYCAPTION = 4,
-        CXBORDER = 5,
-        CYBORDER = 6,
-        CXFIXEDFRAME = 7,
-        CYFIXEDFRAME = 8,
-        CYVTHUMB = 9,
-        CXHTHUMB = 10,
-        CXICON = 11,
-        CYICON = 12,
-        CXCURSOR = 13,
-        CYCURSOR = 14,
-        CYMENU = 15,
-        CXFULLSCREEN = 16,
-        CYFULLSCREEN = 17,
-        CYKANJIWINDOW = 18,
-        MOUSEPRESENT = 19,
-        CYVSCROLL = 20,
-        CXHSCROLL = 21,
-        DEBUG = 22,
-        SWAPBUTTON = 23,
-        CXMIN = 28,
-        CYMIN = 29,
-        CXSIZE = 30,
-        CYSIZE = 31,
-        CXFRAME = 32,
-        CXSIZEFRAME = CXFRAME,
-        CYFRAME = 33,
-        CYSIZEFRAME = CYFRAME,
-        CXMINTRACK = 34,
-        CYMINTRACK = 35,
-        CXDOUBLECLK = 36,
-        CYDOUBLECLK = 37,
-        CXICONSPACING = 38,
-        CYICONSPACING = 39,
-        MENUDROPALIGNMENT = 40,
-        PENWINDOWS = 41,
-        DBCSENABLED = 42,
-        CMOUSEBUTTONS = 43,
-        SECURE = 44,
-        CXEDGE = 45,
-        CYEDGE = 46,
-        CXMINSPACING = 47,
-        CYMINSPACING = 48,
-        CXSMICON = 49,
-        CYSMICON = 50,
-        CYSMCAPTION = 51,
-        CXSMSIZE = 52,
-        CYSMSIZE = 53,
-        CXMENUSIZE = 54,
-        CYMENUSIZE = 55,
-        ARRANGE = 56,
-        CXMINIMIZED = 57,
-        CYMINIMIZED = 58,
-        CXMAXTRACK = 59,
-        CYMAXTRACK = 60,
-        CXMAXIMIZED = 61,
-        CYMAXIMIZED = 62,
-        NETWORK = 63,
-        CLEANBOOT = 67,
-        CXDRAG = 68,
-        CYDRAG = 69,
-        SHOWSOUNDS = 70,
-        CXMENUCHECK = 71,
-        CYMENUCHECK = 72,
-        SLOWMACHINE = 73,
-        MIDEASTENABLED = 74,
-        MOUSEWHEELPRESENT = 75,
-        XVIRTUALSCREEN = 76,
-        YVIRTUALSCREEN = 77,
-        CXVIRTUALSCREEN = 78,
-        CYVIRTUALSCREEN = 79,
-        CMONITORS = 80,
-        SAMEDISPLAYFORMAT = 81,
-        IMMENABLED = 82,
-        CXFOCUSBORDER = 83,
-        CYFOCUSBORDER = 84,
-        TABLETPC = 86,
-        MEDIACENTER = 87,
-        REMOTESESSION = 0x1000,
-        REMOTECONTROL = 0x2001
-    }
-
-    internal enum CacheSlot
-    {
-        DpiX,
-
-        FocusBorderWidth,
-        FocusBorderHeight,
-        HighContrast,
-        MouseVanish,
-
-        DropShadow,
-        FlatMenu,
-        WorkAreaInternal,
-        WorkArea,
-
-        IconMetrics,
-
-        KeyboardCues,
-        KeyboardDelay,
-        KeyboardPreference,
-        KeyboardSpeed,
-        SnapToDefaultButton,
-        WheelScrollLines,
-        MouseHoverTime,
-        MouseHoverHeight,
-        MouseHoverWidth,
-
-        MenuDropAlignment,
-        MenuFade,
-        MenuShowDelay,
-
-        ComboBoxAnimation,
-        ClientAreaAnimation,
-        CursorShadow,
-        GradientCaptions,
-        HotTracking,
-        ListBoxSmoothScrolling,
-        MenuAnimation,
-        SelectionFade,
-        StylusHotTracking,
-        ToolTipAnimation,
-        ToolTipFade,
-        UIEffects,
-
-        MinimizeAnimation,
-        Border,
-        CaretWidth,
-        ForegroundFlashCount,
-        DragFullWindows,
-        NonClientMetrics,
-
-        ThinHorizontalBorderHeight,
-        ThinVerticalBorderWidth,
-        CursorWidth,
-        CursorHeight,
-        ThickHorizontalBorderHeight,
-        ThickVerticalBorderWidth,
-        MinimumHorizontalDragDistance,
-        MinimumVerticalDragDistance,
-        FixedFrameHorizontalBorderHeight,
-        FixedFrameVerticalBorderWidth,
-        FocusHorizontalBorderHeight,
-        FocusVerticalBorderWidth,
-        FullPrimaryScreenWidth,
-        FullPrimaryScreenHeight,
-        HorizontalScrollBarButtonWidth,
-        HorizontalScrollBarHeight,
-        HorizontalScrollBarThumbWidth,
-        IconWidth,
-        IconHeight,
-        IconGridWidth,
-        IconGridHeight,
-        MaximizedPrimaryScreenWidth,
-        MaximizedPrimaryScreenHeight,
-        MaximumWindowTrackWidth,
-        MaximumWindowTrackHeight,
-        MenuCheckmarkWidth,
-        MenuCheckmarkHeight,
-        MenuButtonWidth,
-        MenuButtonHeight,
-        MinimumWindowWidth,
-        MinimumWindowHeight,
-        MinimizedWindowWidth,
-        MinimizedWindowHeight,
-        MinimizedGridWidth,
-        MinimizedGridHeight,
-        MinimumWindowTrackWidth,
-        MinimumWindowTrackHeight,
-        PrimaryScreenWidth,
-        PrimaryScreenHeight,
-        WindowCaptionButtonWidth,
-        WindowCaptionButtonHeight,
-        ResizeFrameHorizontalBorderHeight,
-        ResizeFrameVerticalBorderWidth,
-        SmallIconWidth,
-        SmallIconHeight,
-        SmallWindowCaptionButtonWidth,
-        SmallWindowCaptionButtonHeight,
-        VirtualScreenWidth,
-        VirtualScreenHeight,
-        VerticalScrollBarWidth,
-        VerticalScrollBarButtonHeight,
-        WindowCaptionHeight,
-        KanjiWindowHeight,
-        MenuBarHeight,
-        VerticalScrollBarThumbHeight,
-        IsImmEnabled,
-        IsMediaCenter,
-        IsMenuDropRightAligned,
-        IsMiddleEastEnabled,
-        IsMousePresent,
-        IsMouseWheelPresent,
-        IsPenWindows,
-        IsRemotelyControlled,
-        IsRemoteSession,
-        ShowSounds,
-        IsSlowMachine,
-        SwapButtons,
-        IsTabletPC,
-        VirtualScreenLeft,
-        VirtualScreenTop,
-
-        PowerLineStatus,
-
-        IsGlassEnabled,
-        UxThemeName,
-        UxThemeColor,
-        WindowCornerRadius,
-        WindowGlassColor,
-        WindowGlassBrush,
-        WindowNonClientFrameThickness,
-        WindowResizeBorderThickness,
-
-        NumSlots
-    }
-
-    internal static class Win32Constant
-    {
-        internal const int MAX_PATH = 260;
-        internal const int INFOTIPSIZE = 1024;
-        internal const int TRUE = 1;
-        internal const int FALSE = 0;
-    }
-}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/UnsafeNativeMethods.cs b/src/Shared/HandyControl_Shared/Tools/Interop/UnsafeNativeMethods.cs
deleted file mode 100644
index 378eab05..00000000
--- a/src/Shared/HandyControl_Shared/Tools/Interop/UnsafeNativeMethods.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.InteropServices;
-using System.Security;
-using System.Text;
-
-namespace HandyControl.Tools.Interop
-{
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    internal class UnsafeNativeMethods
-    {
-        [SecurityCritical]
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(ExternDll.User32, SetLastError = true, ExactSpelling = true, EntryPoint = nameof(GetDC), CharSet = CharSet.Auto)]
-        public static extern IntPtr IntGetDC(HandleRef hWnd);
-
-        [SecurityCritical]
-        public static IntPtr GetDC(HandleRef hWnd)
-        {
-            var hDc = IntGetDC(hWnd);
-            if (hDc == IntPtr.Zero)
-            {
-                throw new Win32Exception();
-            }
-
-            return HandleCollector.Add(hDc, CommonHandles.HDC);
-        }
-
-        [SecurityCritical]
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(ExternDll.User32, ExactSpelling = true, EntryPoint = nameof(ReleaseDC), CharSet = CharSet.Auto)]
-        public static extern int IntReleaseDC(HandleRef hWnd, HandleRef hDC);
-
-        [SecurityCritical]
-        public static int ReleaseDC(HandleRef hWnd, HandleRef hDC)
-        {
-            HandleCollector.Remove((IntPtr)hDC, CommonHandles.HDC);
-            return IntReleaseDC(hWnd, hDC);
-        }
-
-        [SecurityCritical]
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(ExternDll.Gdi32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto)]
-        public static extern int GetDeviceCaps(HandleRef hDC, int nIndex);
-
-        [SecurityCritical]
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(ExternDll.User32)]
-        public static extern int GetSystemMetrics(SM nIndex);
-
-        [SecurityCritical]
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(ExternDll.User32, EntryPoint = nameof(DestroyIcon), CharSet = CharSet.Auto, SetLastError = true)]
-        private static extern bool IntDestroyIcon(IntPtr hIcon);
-
-        [SecurityCritical]
-        public static bool DestroyIcon(IntPtr hIcon)
-        {
-            var result = IntDestroyIcon(hIcon);
-            return result;
-        }
-
-        [SecurityCritical]
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(ExternDll.Gdi32, EntryPoint = nameof(DeleteObject), CharSet = CharSet.Auto, SetLastError = true)]
-        private static extern bool IntDeleteObject(IntPtr hObject);
-
-        [SecurityCritical]
-        public static bool DeleteObject(IntPtr hObject)
-        {
-            var result = IntDeleteObject(hObject);
-            return result;
-        }
-
-        [SecurityCritical]
-        public static BitmapHandle CreateDIBSection(HandleRef hdc, ref BITMAPINFO bitmapInfo, int iUsage, ref IntPtr ppvBits, SafeFileMappingHandle hSection, int dwOffset)
-        {
-            if (hSection == null)
-            {
-                hSection = new SafeFileMappingHandle(IntPtr.Zero);
-            }
-
-            var hBitmap = PrivateCreateDIBSection(hdc, ref bitmapInfo, iUsage, ref ppvBits, hSection, dwOffset);
-            return hBitmap;
-        }
-
-        [DllImport(ExternDll.Kernel32, EntryPoint = "CloseHandle", CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern bool IntCloseHandle(HandleRef handle);
-
-        [SecurityCritical, SuppressUnmanagedCodeSecurity]
-        [DllImport(ExternDll.Gdi32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto, EntryPoint = nameof(CreateDIBSection))]
-        private static extern BitmapHandle PrivateCreateDIBSection(HandleRef hdc, ref BITMAPINFO bitmapInfo, int iUsage, ref IntPtr ppvBits, SafeFileMappingHandle hSection, int dwOffset);
-
-        [SecurityCritical, SuppressUnmanagedCodeSecurity]
-        [DllImport(ExternDll.User32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto, EntryPoint = nameof(CreateIconIndirect))]
-        private static extern IconHandle PrivateCreateIconIndirect([In, MarshalAs(UnmanagedType.LPStruct)]ICONINFO iconInfo);
-
-        [SecurityCritical]
-        public static IconHandle CreateIconIndirect([In, MarshalAs(UnmanagedType.LPStruct)]ICONINFO iconInfo)
-        {
-            var hIcon = PrivateCreateIconIndirect(iconInfo);
-            return hIcon;
-        }
-
-        [SecurityCritical, SuppressUnmanagedCodeSecurity]
-        [DllImport(ExternDll.Gdi32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto, EntryPoint = nameof(CreateBitmap))]
-        private static extern BitmapHandle PrivateCreateBitmap(int width, int height, int planes, int bitsPerPixel, byte[] lpvBits);
-
-        [SecurityCritical]
-        internal static BitmapHandle CreateBitmap(int width, int height, int planes, int bitsPerPixel, byte[] lpvBits)
-        {
-            var hBitmap = PrivateCreateBitmap(width, height, planes, bitsPerPixel, lpvBits);
-            return hBitmap;
-        }
-
-        [SecurityCritical, SuppressUnmanagedCodeSecurity]
-        [DllImport(ExternDll.Kernel32, EntryPoint = "GetModuleFileName", CharSet = CharSet.Unicode, SetLastError = true)]
-        private static extern int IntGetModuleFileName(HandleRef hModule, StringBuilder buffer, int length);
-
-        [SecurityCritical]
-        internal static string GetModuleFileName(HandleRef hModule)
-        {
-            var buffer = new StringBuilder(Win32Constant.MAX_PATH);
-            while (true)
-            {
-                var size = IntGetModuleFileName(hModule, buffer, buffer.Capacity);
-                if (size == 0)
-                {
-                    throw new Win32Exception();
-                }
-
-                if (size == buffer.Capacity)
-                {
-                    buffer.EnsureCapacity(buffer.Capacity * 2);
-                    continue;
-                }
-
-                return buffer.ToString();
-            }
-        }
-
-        [SecurityCritical, SuppressUnmanagedCodeSecurity]
-        [DllImport(ExternDll.Shell32, CharSet = CharSet.Auto, BestFitMapping = false, ThrowOnUnmappableChar = true)]
-        internal static extern int ExtractIconEx(string szExeFileName, int nIconIndex, out IconHandle phiconLarge, out IconHandle phiconSmall, int nIcons);
-
-        [DllImport(ExternDll.Shell32, CharSet = CharSet.Auto)]
-        public static extern int Shell_NotifyIcon(int message, NOTIFYICONDATA pnid);
-
-        [SecurityCritical]
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport(ExternDll.User32, SetLastError = true, CharSet = CharSet.Unicode, EntryPoint = "CreateWindowExW")]
-        public static extern IntPtr CreateWindowEx(
-            int dwExStyle,
-            [MarshalAs(UnmanagedType.LPWStr)] string lpClassName,
-            [MarshalAs(UnmanagedType.LPWStr)] string lpWindowName,
-            int dwStyle,
-            int x,
-            int y,
-            int nWidth,
-            int nHeight,
-            IntPtr hWndParent,
-            IntPtr hMenu,
-            IntPtr hInstance,
-            IntPtr lpParam);
-
-        [SecurityCritical]
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(ExternDll.User32, CharSet = CharSet.Unicode, SetLastError = true, BestFitMapping = false)]
-        public static extern short RegisterClass(WNDCLASS wc);
-
-        [DllImport(ExternDll.User32, CharSet = CharSet.Auto)]
-        public static extern IntPtr DefWindowProc(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
-
-        [DllImport(ExternDll.User32, ExactSpelling = true, CharSet = CharSet.Auto)]
-        public static extern bool SetForegroundWindow(IntPtr hWnd);
-
-        [DllImport(ExternDll.User32, CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern IntPtr CallNextHookEx(IntPtr hhk, int nCode, IntPtr wParam, IntPtr lParam);
-
-        [DllImport(ExternDll.Kernel32, CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern IntPtr GetModuleHandle(string lpModuleName);
-
-        [DllImport(ExternDll.User32, CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern bool UnhookWindowsHookEx(IntPtr hhk);
-
-        public enum HookType
-        {
-            WH_KEYBOARD_LL = 13,
-            WH_MOUSE_LL = 14
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        public struct MOUSEHOOKSTRUCT
-        {
-            public NativeMethods.POINT pt;
-            public IntPtr hwnd;
-            public uint wHitTestCode;
-            public IntPtr dwExtraInfo;
-        }
-
-        public delegate IntPtr HookProc(int code, IntPtr wParam, IntPtr lParam);
-
-        [DllImport(ExternDll.User32, CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern IntPtr SetWindowsHookEx(int idHook, HookProc lpfn, IntPtr hMod, uint dwThreadId);
-
-        [DllImport(ExternDll.User32, SetLastError = true)]
-        public static extern IntPtr GetDesktopWindow();
-
-        [DllImport(ExternDll.User32, SetLastError = true)]
-        public static extern IntPtr GetWindowDC(IntPtr window);
-
-        [DllImport(ExternDll.Gdi32, SetLastError = true)]
-        public static extern uint GetPixel(IntPtr dc, int x, int y);
-
-        [DllImport(ExternDll.User32, SetLastError = true)]
-        public static extern int ReleaseDC(IntPtr window, IntPtr dc);
-
-        [DllImport(ExternDll.Gdi32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto)]
-        public static extern int GetDeviceCaps(IntPtr hdc, int nIndex);
-
-        [DllImport(ExternDll.User32, CharSet = CharSet.Auto)]
-        public static extern IntPtr GetDC(IntPtr ptr);
-    }
-}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/WNDCLASS.cs b/src/Shared/HandyControl_Shared/Tools/Interop/WNDCLASS.cs
deleted file mode 100644
index 33dd3903..00000000
--- a/src/Shared/HandyControl_Shared/Tools/Interop/WNDCLASS.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.InteropServices;
-
-namespace HandyControl.Tools.Interop
-{
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    [SuppressMessage("ReSharper", "IdentifierTypo")]
-    internal class WNDCLASS
-    {
-        public int style;
-        public WndProc lpfnWndProc;
-        public int cbClsExtra;
-        public int cbWndExtra;
-        public IntPtr hInstance;
-        public IntPtr hIcon;
-        public IntPtr hCursor;
-        public IntPtr hbrBackground;
-        public string lpszMenuName;
-        public string lpszClassName;
-    }
-}
\ No newline at end of file

From cae862d6b04b3c10fcf10a051108fbf8e3f82ab2 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 18 Jan 2020 00:24:46 +0800
Subject: [PATCH 12/41] add glowwindow images

---
 .../HandyControl_Core_30.csproj               |  50 ++++++++++++++++++
 .../HandyControl_Net_40.csproj                |  50 ++++++++++++++++++
 .../HandyControl_Net_GE45.csproj              |  50 ++++++++++++++++++
 .../Resources/Images/GlowWindow/bottom.png    | Bin 0 -> 1257 bytes
 .../Images/GlowWindow/bottomleft.png          | Bin 0 -> 1294 bytes
 .../Images/GlowWindow/bottomright.png         | Bin 0 -> 1298 bytes
 .../Images/GlowWindow/cornerbottomleft.png    | Bin 0 -> 1311 bytes
 .../Images/GlowWindow/cornerbottomright.png   | Bin 0 -> 1306 bytes
 .../Images/GlowWindow/cornertopleft.png       | Bin 0 -> 1293 bytes
 .../Images/GlowWindow/cornertopright.png      | Bin 0 -> 1318 bytes
 .../Resources/Images/GlowWindow/left.png      | Bin 0 -> 1252 bytes
 .../Images/GlowWindow/leftbottom.png          | Bin 0 -> 1297 bytes
 .../Resources/Images/GlowWindow/lefttop.png   | Bin 0 -> 1292 bytes
 .../Resources/Images/GlowWindow/right.png     | Bin 0 -> 1254 bytes
 .../Images/GlowWindow/rightbottom.png         | Bin 0 -> 1289 bytes
 .../Resources/Images/GlowWindow/righttop.png  | Bin 0 -> 1292 bytes
 .../Resources/Images/GlowWindow/top.png       | Bin 0 -> 1254 bytes
 .../Resources/Images/GlowWindow/topleft.png   | Bin 0 -> 1290 bytes
 .../Resources/Images/GlowWindow/topright.png  | Bin 0 -> 1294 bytes
 19 files changed, 150 insertions(+)
 create mode 100644 src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/bottom.png
 create mode 100644 src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/bottomleft.png
 create mode 100644 src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/bottomright.png
 create mode 100644 src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/cornerbottomleft.png
 create mode 100644 src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/cornerbottomright.png
 create mode 100644 src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/cornertopleft.png
 create mode 100644 src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/cornertopright.png
 create mode 100644 src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/left.png
 create mode 100644 src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/leftbottom.png
 create mode 100644 src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/lefttop.png
 create mode 100644 src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/right.png
 create mode 100644 src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/rightbottom.png
 create mode 100644 src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/righttop.png
 create mode 100644 src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/top.png
 create mode 100644 src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/topleft.png
 create mode 100644 src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/topright.png

diff --git a/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj b/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj
index 600b0889..4f61f64f 100644
--- a/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj
+++ b/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj
@@ -68,4 +68,54 @@
       <Link>Resources\Effects\GrayScaleEffect.ps</Link>
     </Resource>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\bottom.png">
+      <Link>Resources\Images\GlowWindow\bottom.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\bottomleft.png">
+      <Link>Resources\Images\GlowWindow\bottomleft.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\bottomright.png">
+      <Link>Resources\Images\GlowWindow\bottomright.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\cornerbottomleft.png">
+      <Link>Resources\Images\GlowWindow\cornerbottomleft.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\cornerbottomright.png">
+      <Link>Resources\Images\GlowWindow\cornerbottomright.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\cornertopleft.png">
+      <Link>Resources\Images\GlowWindow\cornertopleft.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\cornertopright.png">
+      <Link>Resources\Images\GlowWindow\cornertopright.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\left.png">
+      <Link>Resources\Images\GlowWindow\left.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\leftbottom.png">
+      <Link>Resources\Images\GlowWindow\leftbottom.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\lefttop.png">
+      <Link>Resources\Images\GlowWindow\lefttop.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\right.png">
+      <Link>Resources\Images\GlowWindow\right.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\rightbottom.png">
+      <Link>Resources\Images\GlowWindow\rightbottom.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\righttop.png">
+      <Link>Resources\Images\GlowWindow\righttop.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\top.png">
+      <Link>Resources\Images\GlowWindow\top.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\topleft.png">
+      <Link>Resources\Images\GlowWindow\topleft.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\topright.png">
+      <Link>Resources\Images\GlowWindow\topright.png</Link>
+    </Resource>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
index 08bd19be..092bb8a0 100644
--- a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
+++ b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
@@ -120,6 +120,56 @@
       <Link>Resources\Effects\GrayScaleEffect.ps</Link>
     </Resource>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\bottom.png">
+      <Link>Resources\Images\GlowWindow\bottom.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\bottomleft.png">
+      <Link>Resources\Images\GlowWindow\bottomleft.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\bottomright.png">
+      <Link>Resources\Images\GlowWindow\bottomright.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\cornerbottomleft.png">
+      <Link>Resources\Images\GlowWindow\cornerbottomleft.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\cornerbottomright.png">
+      <Link>Resources\Images\GlowWindow\cornerbottomright.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\cornertopleft.png">
+      <Link>Resources\Images\GlowWindow\cornertopleft.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\cornertopright.png">
+      <Link>Resources\Images\GlowWindow\cornertopright.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\left.png">
+      <Link>Resources\Images\GlowWindow\left.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\leftbottom.png">
+      <Link>Resources\Images\GlowWindow\leftbottom.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\lefttop.png">
+      <Link>Resources\Images\GlowWindow\lefttop.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\right.png">
+      <Link>Resources\Images\GlowWindow\right.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\rightbottom.png">
+      <Link>Resources\Images\GlowWindow\rightbottom.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\righttop.png">
+      <Link>Resources\Images\GlowWindow\righttop.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\top.png">
+      <Link>Resources\Images\GlowWindow\top.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\topleft.png">
+      <Link>Resources\Images\GlowWindow\topleft.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\topright.png">
+      <Link>Resources\Images\GlowWindow\topright.png</Link>
+    </Resource>
+  </ItemGroup>
   <Import Project="..\..\Shared\HandyControl_Shared\HandyControl_Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
index db1055ee..15efdefe 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
@@ -191,6 +191,56 @@
       <Link>Resources\Effects\GrayScaleEffect.ps</Link>
     </Resource>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\bottom.png">
+      <Link>Resources\Images\GlowWindow\bottom.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\bottomleft.png">
+      <Link>Resources\Images\GlowWindow\bottomleft.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\bottomright.png">
+      <Link>Resources\Images\GlowWindow\bottomright.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\cornerbottomleft.png">
+      <Link>Resources\Images\GlowWindow\cornerbottomleft.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\cornerbottomright.png">
+      <Link>Resources\Images\GlowWindow\cornerbottomright.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\cornertopleft.png">
+      <Link>Resources\Images\GlowWindow\cornertopleft.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\cornertopright.png">
+      <Link>Resources\Images\GlowWindow\cornertopright.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\left.png">
+      <Link>Resources\Images\GlowWindow\left.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\leftbottom.png">
+      <Link>Resources\Images\GlowWindow\leftbottom.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\lefttop.png">
+      <Link>Resources\Images\GlowWindow\lefttop.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\right.png">
+      <Link>Resources\Images\GlowWindow\right.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\rightbottom.png">
+      <Link>Resources\Images\GlowWindow\rightbottom.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\righttop.png">
+      <Link>Resources\Images\GlowWindow\righttop.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\top.png">
+      <Link>Resources\Images\GlowWindow\top.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\topleft.png">
+      <Link>Resources\Images\GlowWindow\topleft.png</Link>
+    </Resource>
+    <Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\topright.png">
+      <Link>Resources\Images\GlowWindow\topright.png</Link>
+    </Resource>
+  </ItemGroup>
   <Import Project="..\..\Shared\HandyControl_Shared\HandyControl_Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/bottom.png b/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..11b8dc5e871a10d4b0d6a819658cf3ca63f0c198
GIT binary patch
literal 1257
zcmcIky>HV%6n9aD(m*9XBvc^~CwHk3@%bZZ@X1cqCJhZDp=#Vxn0mD@sY(1H`zpJo
z0tpsaU_+|d8Bq}vBNBfB69WuLOsriI;_ReJ+X1GYd>?-Ie!utbcTe|Xv2klWdpXN-
z+<0xFvc%>Q*2glZ*|=Y={$$f=I9D?=tnFm1=gFqOa6ja@GZ&IR^5y&E-^_T4&acvP
zKrppE7Z|ofI8lL89!l~<{$j*f&L<wL^*hM)906P2IuT;W=d_vF$7Y96uuj^xtMdQ=
z9@v)7-z(I`x?d(6_QG~Rn%fP--0qmF#m|(oT8tRjAryny>AE3`bw1@pY@L`P4^kJ}
z(fQdV7+9?@g0dG7kQbz!DJpr8pBChztQMzlfF`EkHg<tr1hOcyK}JfEeJq)@@ue)A
zwZLkjrAoCQll|%Z2BkiNFp44}QUot(LrGOtD9TWlbIc<bZn+f4IX9f_ksR<;NN5JO
zpX!zH;&pG6>O7wW8npi5us;aohJEpvj4;MNlmrnDm>E!GMwH%!7Z{$`E%lCHwF44)
zK_>*|rlKXtBTmDpLp-TqN=mXQ$vIKUNqIw3k#Z9$g$IZ5J*Q*vx@Xy~t)uXQAr+A%
zqJr3mA9Cu$HJAu-NSIXh<V?rx;6H*{=0GohGw7z*VwsS1i9=i(GR>r;npq}ld4Ypz
z$#!s?K;La^aA^Eze!Z+&S+KH%gStFOeQ=d0vKZ=qBJ@4dlMJ$PYWFI8J|>dKq3N|~
zgag7ItJu3At~Hp?RIM^=WOnC2zaQhkxzRoU<)1enU#(4koqGK?^KE5WpZIikW$)Sk
YqhC+5S9Y%dP#K1+%{MCV=GLD61)*6zjQ{`u

literal 0
HcmV?d00001

diff --git a/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/bottomleft.png b/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/bottomleft.png
new file mode 100644
index 0000000000000000000000000000000000000000..8dcf7cc6fbfadf6dc1bde4b5bd4ce90ebcefc148
GIT binary patch
literal 1294
zcmcIkOK1~87+#By7%f^wDTU&&LN7Ku`$!tIZc@^0Ya&eyO~6_Z-R@4(ZL$w`r|h<f
zh){fhy=n!$dJy#B!HWkG#alr=cq$b1B+{EV56*7Vr0qdZ9d;i3&;Nb@Ki~Y!{c`DI
zZ*(9^QB-dsFHe#AAnAuA!PxiY+EX&^cgG6V2x&JX+Pz@Y&R=yY>d1+p@B6ZT>kl!W
z#^cjC=O6{^mI<o5fhbmhTpV)zJblt5EPa8;ba7HtErU@sYZfuSVN=qmZ!2m8VK9s8
zx|yZ{05s6GG<_veWQ%qV&FT3i2UV6zRduPMrZjpq6P0|CfDMEd;2TZT75y|Fa*AXf
zm>~^97u-nG*&rC0E|x*gauA3!Tufz!IEarhe3DNkM}|Q~!Qhf&0zL_NmL&r(3Q6*j
zWWq*gqGXmFttL*%6YZGfFHO&3Y>N<jp2v6sV>xxmrBW%#@{s3a#3SY|npp8;rhB$U
zvc)4KS9Nqd)GOdsW~~LBrs*J1r?n5K*quP8+ZK<=2z|wd9K*s6GXYA(D26v-IaSMQ
zW?ILe&>iGiPQwMciXa8Z9Zub-T|AN%j50jS@iA72aq%jb5{2`kkeJzqZ#nIP7cEV%
zE$)OTs$5d!STVu2;oF?ra0v!NY!fC_Jvh@YJNS=an%dFJUT~V>wP-3tO=KVwyF@c?
zr)HWe)-1<Ra7H(jI)b)YmtfcU&-_|hld>RX2|IPUm3rqY_hix4eNX6Hq<a};u4i?S
zJRkkR<500`*i#%t?W)+zug{c-Pq83ptC3Y>EgQYf9+f{ont8i&_t(P%>ye*B%fkcx
zLqCp9_PqM|q5u24m1px#>gyY6ME<m#KVBL1ifa#6o)4XSe0}`)sd9GX#m1q{;pn&b
Sn-}H@F;y5Z$uGxl-1!Twv`$t4

literal 0
HcmV?d00001

diff --git a/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/bottomright.png b/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/bottomright.png
new file mode 100644
index 0000000000000000000000000000000000000000..1655887003c40a81683c6edc7aa8712a6d380435
GIT binary patch
literal 1298
zcmcIkO=uHA6ke^>7~4ZFid3}2R`g<a_9toFWs{mFt&NyilYmw5XS+K|*JOX#owD0n
zS}O<@EP4>31&>~P@g|<slOSRbB7%7FAb9X1c=6zDk|u2rdg`$Avv1z_y*J-H=Kgs8
zTz9xHOi@&Kb}UmM^Ip>Thk~(Z_1aT1?Qw^*r4VUzA#Ewxw8yTv6m{TW(08qWng2tK
zhw;b+PCH1!x@CfrZXk*kAQy!ke~a$*2un}kF_F6<sg}Vgnl*_S->@lp$hQ@>iZGZ&
z72QnG000{3T7teD%dt5-ji&UmSqBwo^Cfk*s)`ytlnl$hM8F2Z3h<4Z=}LZru5(Ic
z9he~v>MppNpi@CGFp(PvY0E(%%5V{t6`~+I$nbGqj1Qg$MFoTNiV65Q;8~Uoyd=cQ
zN0O;GIvFOj>}X}FkQr^pB!3Bd3S(P>(DOXT6Bx^>Ku#1z$nucqBg7-(&X`#7Bc?mh
zAlcx_AXjyCyRKKjt4vzcI6>1vpjK-hPO)2oOt&c>krDce4LOE|EoK6giBYQGgyobh
ztCnmWe^hsnXE{|Dq>F+aAh$TRqqgxVqhOTeS&omeLWGN!I8hSLNJ8xDCVazb8$4%e
zdU<9mJXYf3630q0wh7<l)P&105Mq-sb=8A2ZL@>_2&Snmz3geHR=*Zag{X!MWMY?S
z#%<M1Q>C)y7z$46hEhS$HY+l08~>SKBWqF?q%2{pE;mwdUFD7}+Pd!ueS>r-gG}vS
zIYyq3Bf;ZPw943197Jua*o)8m^Tg*;Hj^raR*d(l@Ex`*^WoID>&MrAABr=NKflO6
zTk1%^nmhTZ^WDQIg}1A>)43aq-HFue<-Sk7U0=U14s^JJJ%6@;S-SW0!AtQ+=fc9T
Yee3>!cl5-^H-wzZj^s0I!#D5#1-?yA-T(jq

literal 0
HcmV?d00001

diff --git a/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/cornerbottomleft.png b/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/cornerbottomleft.png
new file mode 100644
index 0000000000000000000000000000000000000000..91bd8329da8c48420e115f90decb7a8e623edc6e
GIT binary patch
literal 1311
zcmcIk%WD%s7~d8tHMQcqRgsSC#e<vKN76LQCVeEWO);?~0c%U8+ucdBCi`G_O43@T
zc+w(@2L(@h6|{=pN}=`WMNkw^g8zabSkS7on>1;A&{Kz<$A0tue&090`Iy_Isq^i=
z6F!Qf+7rX^G@19hy|smmU+=dZAk!XaAdzh)ZN62#<!)NTmmP{~JLLAJ4_|KlBF1BQ
za16(6BxB7qKvvTc#R`xMK#spkA1)J?gRaL|@`9+Cx?fh!Y2>fy7A5soELkZc45m?D
zGa@tqfCicxp)UoKY|@IMf;K#7qs&|?tIQRZuuAtveNsgvU>#u@RP>VJh?NNKaf)Q^
znjsB57hH_c{cbQYmK+5!(?%fR=NN?*0wB=s=R<rr)O`+QWDG`R1Mnfhvn&~SQ3#Qb
zB;z$Y>Lasct2r?pAF9P9e-XNXu_Z!SE|>jf!Ef4m$c4jU$nucq8REe>vj&zcjNzQA
zl5FzCk)zm}<>}?}%G2fyj?lClsNQOaldXCn!>Nf!WP}yjf}Ed)b!GyTh*9)z!nCud
zS&CMVKcv~HY}!Q!#4>{9BDXm;qBig-E@KqsS&nB|f#CvKE-VT?q7WS4g0DL5fG15=
z%gt_w2eVvA<XADt*5F&5YH$g<LTnMnQ{6q&4m<ddV5(Br%bKxE-nFO-L?xsn13N@B
zZo6ixBIZn6mvL0n<vfCxk(Xe@_|N>RS(CCLWeMwbxtV(XDtBek(0y0vtE9Ubq|p56
z6nQ>6-Nzwg=5SfI5w)XYFTU<d5uYoGcz?F@!S#0&z6Ew){Qb%2>*LPq^2lde-$<av
zdux52`%gbi^J@!lgeKu-^R+wQ*#7pr%^g#1-!qZpJrf-(AK$*}c(O8?Uhn(#CtX-P
ka`xH6#^mzP7mvmHrr%3lPmeN-KS(4hF_?-k4NTqq3%XTSGynhq

literal 0
HcmV?d00001

diff --git a/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/cornerbottomright.png b/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/cornerbottomright.png
new file mode 100644
index 0000000000000000000000000000000000000000..07528f329ff4e978cb9e22c97e8701c458d92126
GIT binary patch
literal 1306
zcmcIkOK1~87~YE37%gp8v<Tv`B8W9R`$(E*-K4ZhYg<e#&4Q^HyWO26YqAe^r(|11
zs(7du!Gj0wK?EO2p$K{r?@C2PJ$Uc|#hW(|Jtzn|o1{tGgPuC<Jocae`~H8v`I+lu
znbU2-LqUq7+D3*`<7D3D_dqKdS8ld;kZHR+Fd_#?yA;so{Y`s#!lkI)d;Q+>;p^q!
z#CQM?=5W$M3f3(X$hv_jR)Aa>a{NVlUxl!A`X0IT8Bw(iM$xP(#CV2HNqwHJs3nBK
z6e{RuoCW~UK-c2*xk#E#+euW^hi4s>oz2MVY)Or2bYCJUc_IND2rIxd%BCxNak|PW
zlC^J!G^o1ZQk?GhgMnOn3?wZFfiS~`R8|Osa1X;r`B=2)B*-clj4CGJqkv~wGVr1h
zB_Bzq+UP`(%#x$!#qrcoJtp~!(?yJJ5yDEP!c+vtate@(#bS`<A<u`1N64KqvEqeH
z_h^k|jVFa%)zR&$UOulfWliHaP5Xfwt$sMgZUi#jx_CrJ=qWbj7#22|2~Z+Nv3e7h
zBU@HEQ9J&S?x2e0lw6R^3X+f9;M9!T#G{mgQG#bVKEw(kE-Z5~QRo$g$oX~nn$sqD
z+S2s=%tm-b=At6UiV?OBU*}YZOVAf$oiJ6^{WEQ{gZ~JosSUmCX{TJh7EOhyj0|LA
zmuSXq)J#*wyyX}QPUwbGK+rY|5^Ng(nO`kyQWm5vVWTeBQg2-4mMogOZwY;kbSr}t
zx7|KWo{uj7amZSETu~fEZK~L_Pmg4X&%{WoU+%g!{kA_i$L`tj{*iaE{gbdbU;J`^
za*-Jb2)~x+jz4&ld!oF$(%t=X|HqwD=fvdeYZvZ~eopqD;ySVq<sS=pbz%9=-KF+-
it0%s%bU%LnhkMa-gN=OqiJl!JL8y_zOloOh^6FnrTUFZt

literal 0
HcmV?d00001

diff --git a/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/cornertopleft.png b/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/cornertopleft.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c3449672f78dc1264c0a2f3c679a203846c7534
GIT binary patch
literal 1293
zcmcIkO=uHA6yDZSVzkgIND;(g1y62ff0D*5yQyu`+DMaDvtaG1+ucdJCi}zel-<@U
zQatEIQ1DPZs1)m=;6X1Q3m)|(coaN{2M@(lPm0baY0~zfrw%(m`{sS$d-Kg>9!!@m
z_r*`g8HVXAOysZ8`DoN*y>$HgsJEX^J^pAxi_x|cGw(;6-oy=`VUC@Mde^5fcYaah
zDKa)gav15vavh*qHez@Q3P~u4H`$W`Wf_P(W{Q)t;o1q^bmvhbv^_={4n5tdAp+)6
z)pAr80KfvvRN3pPB46}!Xu+CT#;Ckp(v0PrkullfY+MOt3bql^L1@<<Uk+8a!70;q
zWQHtgxR9F4jzq!0OmQ0IT#P_6A#esSB|&m1A*RJldguZu>jYfU9U!KG$n$g%WhqTR
znoOgy**KjQY*yrJ`SDgv`lqrBgm^N9K@cPYDdFNO6f&6%<V7fo9QEM*C5PxC=lJKE
zB)dF$<Qv%X8hS;%`n<bHRF;hbwOi|Oy4Mcm_$~3Mj4;$aC?t5;W~M-e8s)}KxL9-D
zdbWA|aSNls#Wf$~%90Wx_c?W<cJL^#6O<KsLF9Oe6Ox*ck)?~Wl$zaxZ#o@-7hTh;
zEbWJ<G$Abuyqw}&@I6i~xB?>~_6XBZJv!3?JNS=arqR~RTg3IowU`D(bz~!l_*64t
zzh<T(S6poCBx~7v6+zFbDzIbxXMWABX<5*+gzdWAO}%}UhqCDCekk-!(!&h0(7kqs
zJ|Bb8<4|@hB+xNp4pi*a+p{I=Gg-)wXoF8~KfD^>;$yjIPhYMFJ0HqBL%-M7k8k#`
zej8x7OZd(3?7hb$7;|^0UY+mS{#h?GFE;-CP**;0ZuBZ!@8Zvoy#M&U`_gI;o(pfe
Pl$R-tmGZAg=T`p$bC*w|

literal 0
HcmV?d00001

diff --git a/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/cornertopright.png b/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/cornertopright.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0ab1a22f67d1dbbaae0c92f58d586768310470f
GIT binary patch
literal 1318
zcmcIkOK1~87+xQg8mX^JsReP^-b$0%N79%zNlBB|MolcuVyi-NyE{qNWFPEKyJ;yF
zJXr*3@d1V21P?+*5k)9?@pTjGr3Wb}6nc|h1Q8WylQe02&{Kz<$Nuww-~Z1yKQl9s
zKHKDJ^H3Dkl<ZFolKFt!8ym>@Wv<}}nfBW~NwJZ%sYd0NyJ_}cwkhi1F}Lsew0h$g
zF}C2|VH~%RgjGWaqN*W^;UVjXEO(u5b_mN+*JC(!L68m2Cn?4#@|84`3U`-GNiHA^
zMo~`HBQyYj2C5RFhXN@kWyVon?Vq$zW-=|xlLa}X(A`l_xFis;hOh)mT2Z%!QiLvZ
z3S{k?Aq~ndxDcUZZZI&M8US&_Lcs51y)wi5fxpYg1-VeLs}p1-49-b9;DUf-7&34I
zA0!`1rrhYLhs<G1$qIvszG_VJ7oqbQn*xN6<M<rjXIMGNhC(68aFFA?#KUV(=vXRw
zb-TSnvdNP`wrr_pSudAY8a2jngr?m<wN^cxWYz-dc2ztgBP>ZKWPJ>*F%w{z7=`jp
z7?x-l#c1XDeX4~V!z$Pyp5enTa+^~<Y8{Uf5=K#uVL30uds)B8h6Mh!zz42u!B?Di
zz*B~zW+%4810ov~SVjmiRrnUCDm)BbA+`upR^2_*4m<ddV2WJR%N(<c<!e!7h>A!<
zI<|>s>~_r*S;!ieCgG^6NjU^fJr{;`<3IDOWKGI~lqIay<!0)&tK5}EUH4s~uaNF$
zko?~HljQkmbsvX}k;RT=A!<j(UVMHkO?*%?5ffYQYae5tH{f{h^22BMUKYmJI+h;H
zKDuiR%xwJVSXoakzEDQitxK~lV9|`do>={wp(1L2KKp*()wM(7#@jpX-+nGEj4Z!8
uoc{21Xye4=>ACZ5*5dcu&eZ4MeZlEJ<ISCI@6N1{fK;+Kop{o7?dD%AYG334

literal 0
HcmV?d00001

diff --git a/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/left.png b/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/left.png
new file mode 100644
index 0000000000000000000000000000000000000000..224309337e7d0897a194ae9ca4732e96eec92275
GIT binary patch
literal 1252
zcmcIk&2G~`5Oz^PA*2UDLI{CaxmV)#PtuT;ld4Tx8bm_XSfX&s#@?hRvDdP<vRi%*
z2nl$Ep1E^DeStm#5;u4g4vd{NX?uWESDxMV==)}7za8zD?aq^>{Jp#+NlUG*<_@ga
z!4`7YU@n||d<V;7wBE9EFy7{z&nY0-dKpR5ja#WL{P_L;4><3Lja|_Q85J(~k>z?!
zQVpz?u%^G3Z^sbjW{TKtKO;8x6zcFkQxY$b%+(~I_J|48XG7Po$p|4CxlT=fQEsd4
zpuzUst;3LY4?C89II^pbyjstj2?4Ul1VxEA_9K$i<SZtEed@+C${=D?lh@K@Xt%wM
z8a!mEq-aH3HA<+oqUaU9T3LC7x>TU2)JJ*+>8c8oPK*kCP)s)DdLC9YbOvOnxjD@V
ze>Hheh=5=m$FUL{3J-@^t5&O6)v>M@0a1(&d_j|<A1zOUoW^Og$PV2g(<_Zj`+Q&2
zWI0VV8`HzlV3x>_rs9E&IH3X76cx`R1JML0$!>y&7U$#o<oKIz$YLIjBGl*_X39JV
znrEH!S(6G@*Huj~szy;OSz47CkBL!!b%s9yU7)wQ;|>na)614tA(~3c>Xd#4G^Lw3
z72=FAnd<48F8I-Z1as_}Ucr7i&aTC=F&i_F`62?%wDX!dHW~2HqoVG5bjWbv4^2FG
z{<FSG)zB8umUz~er=`!X@=`W)-7h8lB<N)(*}HP|0G^M#>EqDl0}<1ZNf$cy`S*t%
zz$~|#YgX>a9{c{F-|O`@Pwp2Ag<oJ-z)p^jkKZiRw-=?KpT1rNxYXL{G{3F)KKunO
C=QgYW

literal 0
HcmV?d00001

diff --git a/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/leftbottom.png b/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/leftbottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..025d9496332c75c5e743b83ab6ac8a5ec90f638e
GIT binary patch
literal 1297
zcmcIkO=}ZD7~V=PX>64$R1sQ-?ZJ!5>_^g=B}r+M)~1*kngwGoI^CV5YqB5gPDxs&
zs91?Vp$9L5hvFBah=(E~NPE$P2<kz+coMwWn+Q6)Nt3n*J$2am*q7&d-gllE=5{W7
zrq_Sm&oE4HdNMUl=Wg1&d|h<xTYvV3PMywJTK3U))u+~7fHir+VVDDl-QMy3%hGQe
z>?h*|lC&`*nrQ%8(=o$|kPks#xXd1@Qk6azQOKN?6jKi()ttq_nr<<%k(z~+GA3Xa
zmoy{J0svT`sd4svIKySEB%aeI7j2wh%*x7QS&6FbNWvehNtCQ(f<R5L7>-nnv!13z
z*KQcHz=M!-oE>$OfkGw+lBSJ8D98sCP7Hz2a8QT{(a7*AkVgbeAp-~zAaEQV1WAn0
zj~3%KHsPmp%vOuibZVlRlm5loIYKN6!fLe|tcpR?E<rvTjY3X<f)JpHfU{r_R0|l+
zP(x%(Cxsow)-2C2R~OBi^CZr)ZlYFeZVp+kM26EekJ<=p$bx*3gDquBjM1RvorG!2
zrddfewm+fSxN6#E2PE@i%w_HXwX?SQIE4sK2plg2I5EJ7WIig1rzJ5wvyI;X?V@K)
zRVyy+q=#ibBJrFQ=9=_vpe8*AT_d&`<GJqcX;&Ql$1qiC`DM-974KM71>y?Uu|XW_
z8NbsrRgsFOts|1qbX3C7GD<Pn4*s*gM%DCM&}#`>_j0TB)=}=sqV4;h$TvjyGRfS&
zl>z#E9CIIsyjdhwWMgL6jXn4DM3!Q5>C~v~ThZT+`mb?4ov)tw2iNL<eykqaym<HF
z(d9zV&1J4~YkF$zb-i2cfAGnEcjf1u{^u{(KU^RDSfAPW^=*0c@#_BE(D$!vnUe=!
ZbWGhJ_`KBJbB}5>>G5pp(b%OMe*tmoQj`Dy

literal 0
HcmV?d00001

diff --git a/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/lefttop.png b/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/lefttop.png
new file mode 100644
index 0000000000000000000000000000000000000000..6456879bb8f11417a5e4de0c3a365588869e6046
GIT binary patch
literal 1292
zcmcIkO-~a+7+w^x7BB&$pb24IV`8H1>_<!Ox-Eegq-ran8$~WU>`u$t?nicq>_QAt
zPk7LahJ=$|yc(k(J$NzPjL{f5NaAns?7`V>X@P^DnCyJ)o9B7ncb=Kd<C)TxzUb*F
z!!Uh?>HI96kJ8>9>84}<=KD`{>U1XxN`$ui5p691*weRNhUpmyddJu8)ju?Nl1$E#
zoP!b3EfXlZff-JOd;;>qJ@&XqRr&+OT=BZ3T1Fgc)&h?EhRw)hzKzrxCSU<qbu+^P
z09c@F8TMAP$QA7zUeu>o99&*0De6j1O>68}HY)oPB^#I^;2U+*mHZ4FYD#n+gdqz;
z2&rY*@gNzPE6#wN<zSGA^D&hZ6Cg1f7g9nxHF^=05dl|`34|07IF1g2B&O&`iwPT>
zjnY|mw2CyFpK9i$e;Ia>5L<%K^Srnx#x17``E)uBIROenj3Q$0vPqC1Gu^WdksX~p
zc2!5WL%#xDv|uff49f<ITCKS`WVaHTZqqz!BlM9C`8Wq#%9JS6pcI~j<tUa_&o;I{
zr90TOoSF-AWl;{8dqC~1Z9dK;g0lk03o%ZN@d<@bOX4L-OwRA(H$eO7MN88w%X{fb
zg-=O5CndQieHW-nmtkPUE@ML1gFWqwgZ~(&sV%?kC8r)9i>5+c#|AcuOFiTFdZwvT
z#c~Wpvbuq)7}{o4hV9@#>uXd^uLZr9uyrqYN^c$Ifh^j-ABcQI^dOTg9@-eD&&N>k
zIFzjl@sNX=eK+>TyO9#bTr1?qmB@zigg^Fx>pcv0^m1VA^YbIW&#kY|_pg808r&4V
zF@qx?yLx{;UEAzXYr{id9zHvD{>{(Ij}vcSyt;X&Yw7z1<<9DMk2KkN*&N#HqOwe3
LvXp;4are<*hs;S?

literal 0
HcmV?d00001

diff --git a/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/right.png b/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/right.png
new file mode 100644
index 0000000000000000000000000000000000000000..67dfd00170a7aad5e604fb22f24d77a63c4b8eb3
GIT binary patch
literal 1254
zcmcIkO=}ZD7~V>eG+OWr5kWevcr!cuku+x5q_o-AMw(cf1*0dYyOVTHc4yh0y4#{c
z#e)iZ5Ipox6vd;rD*XYTy!a3F<Vonk*-e_XJ?N>!&d0ty&-1?X%rLK(8@DI3SF?g3
zOx6~S6+Tb!K9)Jn$FsXHp7LotoU54`-kxOamkGdMydMg}nF~oD`}X76J`Y}I^DR~l
z2xboTfa$nIkTs~}p`tz#FGgJDe1d4zmyktW3EOm)NU`e+`b_L&t4kPIB^}2rivR!-
zICfdQSE$Q%ze?7e#m#^;Hyft4*|kcxI8({$G2&#GFbrb1=Y=RPi>W5!>m&?CkV06u
zEY2p$K&!qCsx%-VFDW@o*76`fEvZGdRGhvEnwWt**aK=2sItrl6=_BO@nX^@R<eB7
z1G|k@jD<l?{#O>)81oT?Q4~p$Cefe+l~Sn$WfiJwjw5p6hR1N6^TO+WkpmrrgjV4A
zsb7gMUZv}-EQ(2@VH<1?`@=+DI53af2xII+MUvrAnG<y$MCnP;z@)TS>2H6*2}neP
zZV0MPO;4CdK%=Z9J~1#O6;)Q$oUG-Pys4Csb_;2R2Z#85&@p<Q+D?1pD7|1RMWo26
zAP?w=Km)oC6C(~8le(Vl=~x{6$1vL(`sJ?&z4TaY3z8mjiN`|jnR3)K+d^#`xR_NO
z7k3Esy^an?!GG4*ubN*Ael6kfULKS_JjxSUjC?;4`M&5$CRsbReT_dKSCYq}N!u*K
z0TGVf*t?&m8XR+@X3UzI?ZTIj69PCl{$aoO_VMq^_ssO`_gj~|cUya3clZ8G?R=hi
Tv-HdO$q7PjzG3XlJ$(KbM_N6~

literal 0
HcmV?d00001

diff --git a/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/rightbottom.png b/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/rightbottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a7ea61bcfb49e4a7a4eba63b2a893686037b91e
GIT binary patch
literal 1289
zcmcIkO-~a+7+#G+Ex`yTh8T&H<w|$<qos7SErAwjiCd6v6g3*QyVJ6^`;pxtyCr@Q
z4@OT$4<^We@S^d+O%q~bj8Tt7|AJR99-Q5l7C7jM$<D{Vd7kHe=b6boT`JEH#xKSx
ziW)2x3(I6aLwaAVkBmbf-|mv>ls8jSVx--R=}$s{Q@r6()WC4qPkjIR;13C2z_Tkj
z?;;f&wgnW!L=-DPE(tmQE`8o7DnlV+MZO|xw#lfvT}4b_I+QdOII7k_7*tW+u(C7&
zfCh%1rLU)CR(A4e%_wfTsIpO3w2g+A(dnsNTna=&HW5}qU^XpJ46<~jDUx*<hBSyE
zxRIr&!(?DZUIKaBMIgy=35^w!AUVPCX+D#l7zY&<g9X(Bd>Zg9O9oyP(&Qt>M2*hH
z$t<~gO<XR_b#juwEWL)YBSPr=KI03F?bace$z&kQL!M6%M8a!XSPc@EH`W%}*C`-R
za}6i*E7Vo1_BzhebeO2yI-66SZX(O;m`7}cf$BhxVPRL95G4{6qm!^*#kQNd_V(ut
z7x}i^@IbyINFnnOsF$_JM+Ft59M5umf)x^6QsFY9FewVDn+N!9&=I<9>qf10n4VI&
zw8*hyitW%3fI4&uhDIDPCUQO8(~&s%k72sj^~+gzo6)i88bnQGA`5%OGw!fwx+d0a
z*Hm%NFx5JOj#ZanFZj>;+EtTlL9Qk2-pl>cyGMB}i=OYtBHtE0&LnFmw?@hHF%muw
z6}yIg)kV~i8@u@Ca+zR?rNXol+cH0MXE(vQ+4s-4TNA$;&GF=?z1Z-F#dq8H2Nu4x
zb{~)SmwyCHFCL!$cKg<=&7F~}^8D|wtIrntwQD=M$(P{HrMa=%XmwjAnpA1FTzEaR
G`sgn&<4N)W

literal 0
HcmV?d00001

diff --git a/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/righttop.png b/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/righttop.png
new file mode 100644
index 0000000000000000000000000000000000000000..58b3596035b51b825dcea5f86d09c1e9a2b7235e
GIT binary patch
literal 1292
zcmcIkO-~a+7+wq^rN{w4h)B?Jy&1c+A1&){wk6PlRB0u26On^)*`2m)yC3Wh=~9VN
zqKVwR7{i~CgZ=<Kkj8|QHxs=Wuili4#yH!S7C7jM$<D{Vd7kHe=b6cD&gX9qMlVJw
ziW<z$W){fYPkLXZkBmc&ce`Zj^{29GgtYaD@gfAcv-f<88aNa7o{wK1|0cm<JiUn1
z9@4Ps*g!QcM6m+o;*jGX(r0T#Whg`}=H_JGu^7#8mJt(JE~QKauBKNI2Fs{q+DRG!
zKm*fA(svU%Hs_{M*_^F=s8G+VdcC4c20f9ADuGPM7Qz|`tg7wHL6UB2%48jeAq|=k
zTuIWCVKT6on+IvfLm<v@F`X6SAU@9UA}@*K*FizU;Fe|sUIaYLl7W{6k$j|>W}{P4
zGAo`@lov8H?VRK<NtZEpWe97v8dDP($16cjk|fCTkmq9r5%bq<tOYUKzuFQx(8(ZQ
z_e{6xSE#EkJF7TJ(_x}cYi~|-JBe(+Z62`^2AT^whJ_tvLR3glZk~kWsg6@kwYEQF
zdZ^}j6(6Jvf)X;1fVx?`e3a2JO7Sem$5<i8#Z^v{g&VSvSUSXSfsWC0j$szpj?xn<
zC(0ZvC)hUq5U5R8U}(f4W16mqdpZ^e|1r$aJAS#VUbT5Fh7M5`S;)pd@r*m_nW4)?
z$Fnq?GA*ryplg>D*bV-(zE;)bT99iAJNNRS^v+S9$fE1}iO9D^PcljQ)YcezJ}!ih
zL%}KHn&u(u*p0pO_Hv$JZf7%-YGljWn~XkTPxtO*V}Bareq-bQv#;-mr&g|fd-<WS
zUirSWIUrv8A?>~%JO7m5pPN$~E2DtlD{p*0H}dM|uWj@B$fKU^(f-ELr}b+@mdZ}&
KGjFCIZ2Sd|t4=2X

literal 0
HcmV?d00001

diff --git a/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/top.png b/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/top.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5c30ca663383d4463dcad0db05a52de0a4d9221
GIT binary patch
literal 1254
zcmcIkJ#W)M7<OBP(m)4_1PFmR8L?rXKaz%6cB(dMNDv8CW1ui`wJ(WD?6d5v>_&(I
zmhuz&Cr}X*I}&1KU|~Wm{Q*b}EU4n_q)F2Ork;Ese(!yr_r2#{-JA91-G%JcEXQ#R
z^;%_v%`>deXU?+mSG9V;rZeGc-ORA|B4h6+n||#{$Z_WulRoqH`^!Jfc!{oU(sF<i
zb%+N{$HknaLOBOz<vD*bVk{RDkIlw?%_6RdY_f&L*!4MmIrfp&!xU`cj^i0T0DuRM
zZSart4XNRmao4F00^AxjO>5AziZ;Jo%IdMkz%Hf;#BSdUwb<ZOPK~V-Gvq<)LVE_k
zk^}>rjdf5a0R}ly7A#54f!va)6qI6N={9H~3hp5fC<UNM5*rjvEwGOzlQzDTWwRdG
zZEd4c9mQmS2H&OB*C33dNQ_jG1RW?Bi$y3YP*DWtA%r^~MX}(8H-{ugJQW;Tf#auo
zCA?^hY*T~hlR)D(Ivn!HfxK`e9+MHq$cM5h!7(!f>ddI6H$eiEkbY@+{Hhb+hy=Y5
zlv}EvAg7!rQ73p@K@^u1Nmc|&737>L7d7>crskg>!w;QKz#GJN+B?(myeStnS<>>-
z2!70I1lM6A#4%w~)sr)wu!H{yW?N&u{OzEhUW;u(+{Z5VXvj2^r!})JtxW<K(URk$
z4u-zh(c#4S&-{j2v$9}i3CDGLl=}E8Ph~OD{Z#0Oq^B9AJG*zCJs($+$Du{qG(rL9
zPE_oJ_cxl%=T^P4VrKRpetI|00d8)8{qo1Pp9hD+m-g<5`OiPjKiYpi_j{&BX1`rK
RTr?PftFJXHZ&#na`U~P~JP7~*

literal 0
HcmV?d00001

diff --git a/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/topleft.png b/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/topleft.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3fef880bf1620234b68372b4fd85ae857f55cc8
GIT binary patch
literal 1290
zcmcIk%WD%s7+)XM7%f_bRupkq@n&}Rku+x6q>pSL5fekR*eVEacPHtZ?4!F=cN;{C
zAlP$3Xi-5Bya`h9;7LIQL68=_h@SMWe}D&PH)+!Lpr;NykNxKR{l0I0^D)ci(nN3k
zbey87-om6jMdlvT568l>Z|&w2G9C0r3rdW%yD|M?xamw@_bBSfiLme6{C@8bG4|uJ
z8Ju^KiVfQWieVy(6(E;{9DkcW=@XW|&|{`}MbvDQQFVJ3F@fn&(oo>2S{-39i)x0I
zr2zmmF!U@vohq_LCy(Zg$)<}c&61)u>sm&qhjMW#5DC~sSOtOEuskuy(h;Xf)}a~F
zAacR=EIkqi12e@k$lERgNrp>ktdIoBL55HBne^aAP*E|stXhCi1D<8cz>7kfd?cBu
z(YZL8C0DPCQ}TE_Ci%<Ka~L}!gud@HzQEXS4RV=G2C_Wl`2_Juc#9TRgM{UsZ;@>A
z$jH-N!-@0?dDU5a0cUAC4Ag1u!>LXukma?-BQnB3bs)#Eu)|D%5;2O=P1vqt+l^f7
z_~V9)eA}&iAYT!r5V^yt8?}o^vWiiTXE{E>3JET$a2Zj!Bnqh;+wd)?UGSo<8`Z^~
z@RY)(MUE9yY#YAKsSTH4D8x2lBGtn)?XrXa2&QWty_^NN5nYR}LDWDdvam-q<92GM
zYhu-QO%>-1Q>`KBSTzZDjsMKAl{F~~QkJk&ms_cKu5wQnUETMDzD2s1LFV?ao+Z!6
zsqk^A*j4PSE~0i-?A7&iCE`;k$RkQ@^}*+n_|ovv{KoW)H|5`(o;_cA{^`T;v!5%Q
z?;i`t`!Bry`s0{<XrqUIHSq14^N4Hm^Itx0tSq0Ic=v1d?fRXifi>em&r?$fA2+Hn
LR+3+i-n#!65lc>&

literal 0
HcmV?d00001

diff --git a/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/topright.png b/src/Shared/HandyControl_Shared/Resources/Images/GlowWindow/topright.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6129fe7a08c1d6c866233234a927bbc12abe7b3
GIT binary patch
literal 1294
zcmcIkO=}ZD7+$MLj8t32Qbg&nB6x6j_9JP`vPo@|)<#S$&1$Qlb+bE3*JMA~ox0m1
z#R`Io=+#>MIC=0;5b<n^q8E|kQScvl@CSHsHc6AV2R(Jz`Pg^f=Xu|G=4BpC6wY-=
zk47nq>duX4C&|2*^nH<V?0t6aIhpo&BRM5P+U<ybKiqW2uXq%-|4`U>egC=mhZy_t
z=rqo_NX3S20mU#8#fgxQL0-5?ANC1LZ|E_dzaVM0$*Q_tLTq3<lsptTs#Zl9lu*U6
zQZxX728N!Zr{Z}o?_|)dF}~oU;zB{u7OGlOr-#x}Igkk0L|6rZS+hJTNYM>WiL662
zq(Q?4S5x$G7z|A3CqTw_5s0xoqj6#k#0FU*AtV!nr$JH0;Jj)9Apr!ABZDA`3G$I-
z8jVgz$t=5iS(?m_wPKRL6g`WvBSGl<KI@CD?N%V4OeP^GKtW)L2jk6KSPdA<JJBTB
z;K?FSa}B4VSIDcD>^YpG=`c{cwGO8`?Ld~-5|79T1J!{%%fU7?0m{TEHEzOo72B?*
zo5vqBT;$ts)dQKLD2K=`PMxS7Jj$vVr3H=`7*1sPn8GI|@r)$KuWrIOowmXAwr-T?
zx5DEJpOAP?igPXaCZ`r$hM^FfglVWAo@tvM{6{cdYwP9AxwXc%=o&;dWFiZDL^FP?
zX1XSoZP!$B+A!4$f{s;@VaNE-{F+&lvLIy%+jY5-diyGOWYN)mN9dcRI~ioQYxy{N
zKKjGQp=g(}ueylZR<Re~4HSq^K9?O<BFpH}TC~nZGA~!wKeF0~Uo%fG`)@Np&h}g{
zefoOf*1fK3&z)0F-|w0HRKNFzS=zl?zqC?+I^dh-^&^4%dFjRC$+g!93y+Vz|MKnC
QLqbgDMhn^1ksEja0@77Z%K!iX

literal 0
HcmV?d00001


From c1d6e901b2f96f981370a32f4dd5999c9b2be64e Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 18 Jan 2020 14:23:47 +0800
Subject: [PATCH 13/41] add function codes

---
 .../Themes/Styles/Window.xaml                 |   7 +-
 .../Themes/Styles/Window.xaml                 |  11 +-
 .../Themes/Styles/Window.xaml                 |   7 +-
 .../HandyControlDemo_Shared/App.xaml.cs       |   1 +
 .../HandyControlDemo_Shared/MainWindow.xaml   |   1 -
 .../Window/AboutWindow.xaml                   |   1 -
 .../Window/BlurWindow.xaml                    |   1 -
 .../Window/CommonWindow.xaml                  |   1 -
 .../Window/CustomNonClientAreaWindow.xaml     |   1 -
 .../Window/GlowWindow.xaml                    |   4 +-
 .../Window/NoNonClientAreaDragableWindow.xaml |   1 -
 .../Controls/Window/BlurWindow.cs             |   6 +
 .../Controls/Window/GlowWindow.cs             | 663 +++++++++++++++++-
 .../Controls/Window/Window.cs                 |   5 +
 .../Data/DisposableObject.cs                  |  69 ++
 .../Data/GlowWindow/ChangeScope.cs            |  21 +
 .../Data/GlowWindow/GlowBitmap.cs             | 113 +++
 .../Data/GlowWindow/GlowBitmapPart.cs         |  22 +
 .../Data/GlowWindow/GlowDrawingContext.cs     |  51 ++
 .../Data/GlowWindow/GlowEdge.cs               | 587 ++++++++++++++++
 .../HandyControl_Shared/Data/HwndWrapper.cs   | 102 +++
 .../HandyControl_Shared/Data/ResourceToken.cs |   4 +
 .../HandyControl_Shared.projitems             |   9 +
 .../Extension/DependencyObjectExtension.cs    |  18 +
 .../Tools/Helper/ConfigHelper.cs              |   9 +
 .../Tools/Helper/DpiHelper.cs                 |  61 +-
 .../Tools/Helper/IconHelper.cs                |   2 +-
 .../Tools/Helper/ScreenHelper.cs              |  85 +++
 .../Tools/Helper/VisualHelper.cs              |  42 +-
 .../Tools/Interop/InteropMethods.cs           | 328 +++++++--
 .../Tools/Interop/InteropValues.cs            | 364 +++++++---
 31 files changed, 2428 insertions(+), 169 deletions(-)
 create mode 100644 src/Shared/HandyControl_Shared/Data/DisposableObject.cs
 create mode 100644 src/Shared/HandyControl_Shared/Data/GlowWindow/ChangeScope.cs
 create mode 100644 src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmap.cs
 create mode 100644 src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmapPart.cs
 create mode 100644 src/Shared/HandyControl_Shared/Data/GlowWindow/GlowDrawingContext.cs
 create mode 100644 src/Shared/HandyControl_Shared/Data/GlowWindow/GlowEdge.cs
 create mode 100644 src/Shared/HandyControl_Shared/Data/HwndWrapper.cs
 create mode 100644 src/Shared/HandyControl_Shared/Tools/Extension/DependencyObjectExtension.cs
 create mode 100644 src/Shared/HandyControl_Shared/Tools/Helper/ScreenHelper.cs

diff --git a/src/Core_30/HandyControl_Core_30/Themes/Styles/Window.xaml b/src/Core_30/HandyControl_Core_30/Themes/Styles/Window.xaml
index f0c9acdb..823319e4 100644
--- a/src/Core_30/HandyControl_Core_30/Themes/Styles/Window.xaml
+++ b/src/Core_30/HandyControl_Core_30/Themes/Styles/Window.xaml
@@ -48,12 +48,9 @@
     </Style>
 
     <Style TargetType="Window">
-        <Setter Property="UseLayoutRounding" Value="True"/>
-    </Style>
-
-    <Style x:Key="WindowDefault" TargetType="Window">
-        <Setter Property="Background" Value="{DynamicResource BackgroundBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
+        <Setter Property="UseLayoutRounding" Value="True"/>
     </Style>
 
     <Style x:Key="WindowWin10" TargetType="controls:Window">
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml
index b1a550d2..e4a662a5 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml
@@ -49,12 +49,9 @@
     </Style>
 
     <Style TargetType="Window">
-        <Setter Property="UseLayoutRounding" Value="True"/>
-    </Style>
-
-    <Style x:Key="WindowDefault" BasedOn="{x:Null}" TargetType="Window">
-        <Setter Property="Background" Value="{DynamicResource BackgroundBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
+        <Setter Property="UseLayoutRounding" Value="True"/>
     </Style>
 
     <Style x:Key="WindowWin10" BasedOn="{x:Null}" TargetType="controls:Window">
@@ -182,6 +179,10 @@
         <Setter Property="Background" Value="Transparent"/>
     </Style>
 
+    <Style x:Key="WindowGlow">
+
+    </Style>
+
     <Style TargetType="controls:ImageBrowser">
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="MinWidth" Value="400"/>
diff --git a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml
index 35b4e35b..0d7b070b 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml
+++ b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml
@@ -48,12 +48,9 @@
     </Style>
 
     <Style TargetType="Window">
-        <Setter Property="UseLayoutRounding" Value="True"/>
-    </Style>
-
-    <Style x:Key="WindowDefault" TargetType="Window">
-        <Setter Property="Background" Value="{DynamicResource BackgroundBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
+        <Setter Property="UseLayoutRounding" Value="True"/>
     </Style>
 
     <Style x:Key="WindowWin10" TargetType="controls:Window">
diff --git a/src/Shared/HandyControlDemo_Shared/App.xaml.cs b/src/Shared/HandyControlDemo_Shared/App.xaml.cs
index b6205ec7..5bdcc810 100644
--- a/src/Shared/HandyControlDemo_Shared/App.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/App.xaml.cs
@@ -56,6 +56,7 @@ namespace HandyControlDemo
                     UpdateSkin(GlobalData.Config.Skin);
                 }
 
+                ConfigHelper.Instance.SetWindowDefaultStyle();
                 ConfigHelper.Instance.SetSystemVersionInfo(CommonHelper.GetSystemVersionInfo());
 
                 ServicePointManager.SecurityProtocol = (SecurityProtocolType)(SslProtocols)0x00000C00;
diff --git a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
index 36c4906d..cf373d52 100644
--- a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
@@ -7,7 +7,6 @@
                xmlns:userControl="clr-namespace:HandyControlDemo.UserControl"
                xmlns:data="clr-namespace:HandyControlDemo.Data"
                mc:Ignorable="d"
-               Style="{StaticResource WindowBlur}"
                Title="HandyControlDemo"
                ShowTitle="False"
                ResizeMode="CanResizeWithGrip"
diff --git a/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml
index cc46e5a7..b553870f 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml
@@ -10,7 +10,6 @@
            ShowTitle="True"
            BorderThickness="1"
            BorderBrush="#262e2f"
-           Style="{StaticResource WindowWin10}"
            ResizeMode="NoResize"
            ShowInTaskbar="False"
            WindowStartupLocation="CenterOwner"
diff --git a/src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml
index 3bcb277a..573688c2 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml
@@ -8,7 +8,6 @@
                mc:Ignorable="d"
                WindowStartupLocation="CenterScreen"
                Title="{x:Static langs:Lang.Title}"
-               Style="{StaticResource WindowBlur}"
                Height="450" 
                Width="800" 
                Icon="/HandyControlDemo;component/Resources/Img/icon.ico">
diff --git a/src/Shared/HandyControlDemo_Shared/Window/CommonWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/CommonWindow.xaml
index a44dd0f1..57f506a2 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/CommonWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Window/CommonWindow.xaml
@@ -8,7 +8,6 @@
            mc:Ignorable="d"
            Background="{DynamicResource MainContentBackgroundBrush}"
            WindowStartupLocation="CenterScreen"
-           Style="{StaticResource WindowWin10}"
            Title="{x:Static langs:Lang.Title}" 
            Height="450" 
            Width="800" 
diff --git a/src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml
index a39bbba1..8cfc0d4c 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml
@@ -12,7 +12,6 @@
            NonClientAreaHeight="69"
            Background="{DynamicResource MainContentBackgroundBrush}"
            WindowStartupLocation="CenterScreen"
-           Style="{StaticResource WindowWin10}"
            ShowTitle="False"
            Title="{x:Static langs:Lang.Title}" 
            Height="450" 
diff --git a/src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml
index d24c5ea6..34a7945a 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml
@@ -1,4 +1,4 @@
-<hc:GlowWindow x:Class="HandyControlDemo.Window.GlowWindow"
+<Window x:Class="HandyControlDemo.Window.GlowWindow"
                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"
@@ -14,4 +14,4 @@
     <Grid>
         
     </Grid>
-</hc:GlowWindow>
+</Window>
diff --git a/src/Shared/HandyControlDemo_Shared/Window/NoNonClientAreaDragableWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/NoNonClientAreaDragableWindow.xaml
index 7a9199fe..39d0715f 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/NoNonClientAreaDragableWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Window/NoNonClientAreaDragableWindow.xaml
@@ -8,7 +8,6 @@
                mc:Ignorable="d"
                WindowStartupLocation="CenterScreen"
                ShowTitle="True"
-               Style="{StaticResource WindowBlur}"
                Icon="/HandyControlDemo;component/Resources/Img/icon.ico"
                ShowNonClientArea="False"
                Title="NoClientDragableWindow" 
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/BlurWindow.cs b/src/Shared/HandyControl_Shared/Controls/Window/BlurWindow.cs
index 8e461830..9defae36 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/BlurWindow.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/BlurWindow.cs
@@ -1,4 +1,5 @@
 using System.Runtime.InteropServices;
+using System.Windows;
 using System.Windows.Media;
 using HandyControl.Data;
 using HandyControl.Tools;
@@ -7,6 +8,11 @@ namespace HandyControl.Controls
 {
     public class BlurWindow : Window
     {
+        static BlurWindow()
+        {
+            StyleProperty.OverrideMetadata(typeof(BlurWindow), new FrameworkPropertyMetadata(Application.Current.FindResource(ResourceToken.WindowBlur)));
+        }
+
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs b/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs
index eba66263..eda2faef 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs
@@ -1,7 +1,666 @@
-namespace HandyControl.Controls
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Interop;
+using System.Windows.Media;
+using System.Windows.Threading;
+using HandyControl.Data;
+using HandyControl.Expression.Drawing;
+using HandyControl.Tools;
+using HandyControl.Tools.Extension;
+using HandyControl.Tools.Interop;
+
+namespace HandyControl.Controls
 {
     public class GlowWindow : System.Windows.Window
     {
-        
+        internal int DeferGlowChangesCount;
+
+        private IntPtr _ownerForActivate;
+
+        private readonly GlowEdge[] _glowEdges = new GlowEdge[4];
+
+        private DispatcherTimer _makeGlowVisibleTimer;
+
+        private bool _isGlowVisible;
+
+        private bool _useLogicalSizeForRestore;
+
+        private bool _isNonClientStripVisible;
+
+        private bool _updatingZOrder;
+
+        private int _lastWindowPlacement;
+
+        private Rect _logicalSizeForRestore = Rect.Empty;
+
+        public static readonly DependencyProperty ActiveGlowColorProperty = DependencyProperty.Register(
+            "ActiveGlowColor", typeof(Color), typeof(GlowWindow), new PropertyMetadata(default(Color), OnGlowColorChanged));
+
+        public Color ActiveGlowColor
+        {
+            get => (Color)GetValue(ActiveGlowColorProperty);
+            set => SetValue(ActiveGlowColorProperty, value);
+        }
+
+        public static readonly DependencyProperty InactiveGlowColorProperty = DependencyProperty.Register(
+            "InactiveGlowColor", typeof(Color), typeof(GlowWindow), new PropertyMetadata(default(Color), OnGlowColorChanged));
+
+        public Color InactiveGlowColor
+        {
+            get => (Color)GetValue(InactiveGlowColorProperty);
+            set => SetValue(InactiveGlowColorProperty, value);
+        }
+
+        static GlowWindow()
+        {
+            StyleProperty.OverrideMetadata(typeof(GlowWindow), new FrameworkPropertyMetadata(Application.Current.FindResource(ResourceToken.WindowGlow)));
+            ResizeModeProperty.OverrideMetadata(typeof(GlowWindow), new FrameworkPropertyMetadata(OnResizeModeChanged));
+        }
+
+        public void ChangeOwnerForActivate(IntPtr newOwner)
+        {
+            _ownerForActivate = newOwner;
+        }
+
+        public void ChangeOwner(IntPtr newOwner)
+        {
+            var _ = new WindowInteropHelper(this)
+            {
+                Owner = newOwner
+            };
+            foreach (var current in LoadedGlowWindows) current.ChangeOwner(newOwner);
+            UpdateZOrderOfThisAndOwner();
+        }
+
+        private static int PressedMouseButtons
+        {
+            get
+            {
+                var num = 0;
+                if (InteropMethods.IsKeyPressed(1)) num |= 1;
+                if (InteropMethods.IsKeyPressed(2)) num |= 2;
+                if (InteropMethods.IsKeyPressed(4)) num |= 16;
+                if (InteropMethods.IsKeyPressed(5)) num |= 32;
+                if (InteropMethods.IsKeyPressed(6)) num |= 64;
+                return num;
+            }
+        }
+
+        private IEnumerable<GlowEdge> LoadedGlowWindows => from w in _glowEdges where w != null select w;
+
+        protected virtual bool ShouldShowGlow
+        {
+            get
+            {
+                var handle = this.GetHandle();
+                return InteropMethods.IsWindowVisible(handle) && !InteropMethods.IsIconic(handle) &&
+                       !InteropMethods.IsZoomed(handle) && ResizeMode != ResizeMode.NoResize;
+            }
+        }
+
+        private bool IsGlowVisible
+        {
+            get => _isGlowVisible;
+            set
+            {
+                if (_isGlowVisible != value)
+                {
+                    _isGlowVisible = value;
+                    for (var i = 0; i < _glowEdges.Length; i++)
+                    {
+                        GetOrCreateGlowWindow(i).IsVisible = value;
+                    }
+                }
+            }
+        }
+
+        private GlowEdge GetOrCreateGlowWindow(int direction)
+        {
+            return _glowEdges[direction] ?? (_glowEdges[direction] = new GlowEdge(this, (Dock)direction)
+            {
+                ActiveGlowColor = ActiveGlowColor,
+                InactiveGlowColor = InactiveGlowColor,
+                IsActive = IsActive
+            });
+        }
+
+        private static void OnResizeModeChanged(DependencyObject obj, DependencyPropertyChangedEventArgs e)
+        {
+            var customChromeWindow = (GlowWindow)obj;
+            customChromeWindow.UpdateGlowVisibility(false);
+        }
+
+        private static void OnGlowColorChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
+        {
+            ((GlowWindow)obj).UpdateGlowColors();
+        }
+
+        private void UpdateGlowColors()
+        {
+            using (DeferGlowChanges())
+            {
+                foreach (var current in LoadedGlowWindows)
+                {
+                    current.ActiveGlowColor = ActiveGlowColor;
+                    current.InactiveGlowColor = InactiveGlowColor;
+                }
+            }
+        }
+
+        private void UpdateGlowVisibility(bool delayIfNecessary)
+        {
+            var shouldShowGlow = ShouldShowGlow;
+            if (shouldShowGlow != IsGlowVisible)
+            {
+                if (SystemParameters.MinimizeAnimation && shouldShowGlow && delayIfNecessary)
+                {
+                    if (_makeGlowVisibleTimer != null)
+                    {
+                        _makeGlowVisibleTimer.Stop();
+                    }
+                    else
+                    {
+                        _makeGlowVisibleTimer = new DispatcherTimer
+                        {
+                            Interval = TimeSpan.FromMilliseconds(200.0)
+                        };
+                        _makeGlowVisibleTimer.Tick += OnDelayedVisibilityTimerTick;
+                    }
+
+                    _makeGlowVisibleTimer.Start();
+                    return;
+                }
+
+                StopTimer();
+                IsGlowVisible = shouldShowGlow;
+            }
+        }
+
+        private void StopTimer()
+        {
+            if (_makeGlowVisibleTimer != null)
+            {
+                _makeGlowVisibleTimer.Stop();
+                _makeGlowVisibleTimer.Tick -= OnDelayedVisibilityTimerTick;
+                _makeGlowVisibleTimer = null;
+            }
+        }
+
+        private void OnDelayedVisibilityTimerTick(object sender, EventArgs e)
+        {
+            StopTimer();
+            UpdateGlowWindowPositions(false);
+        }
+
+        private void UpdateGlowWindowPositions(bool delayIfNecessary)
+        {
+            using (DeferGlowChanges())
+            {
+                UpdateGlowVisibility(delayIfNecessary);
+                foreach (var current in LoadedGlowWindows) current.UpdateWindowPos();
+            }
+        }
+
+        private IDisposable DeferGlowChanges() => new ChangeScope(this);
+
+        internal void EndDeferGlowChanges()
+        {
+            foreach (var current in LoadedGlowWindows) current.CommitChanges();
+        }
+
+        private void UpdateGlowActiveState()
+        {
+            using (DeferGlowChanges())
+            {
+                foreach (var current in LoadedGlowWindows)
+                {
+                    current.IsActive = IsActive;
+                }
+            }
+        }
+
+        private void DestroyGlowWindows()
+        {
+            for (var i = 0; i < _glowEdges.Length; i++)
+            {
+                using (_glowEdges[i])
+                {
+                    _glowEdges[i] = null;
+                }
+            }
+        }
+
+        private void WmActivate(IntPtr wParam, IntPtr lParam)
+        {
+            if (_ownerForActivate != IntPtr.Zero)
+                InteropMethods.SendMessage(_ownerForActivate, InteropMethods.NOTIFYOWNERACTIVATE, wParam, lParam);
+        }
+
+        private void WmWindowPosChanging(IntPtr hwnd, IntPtr lParam)
+        {
+            var windowpos = (InteropValues.WINDOWPOS)Marshal.PtrToStructure(lParam, typeof(InteropValues.WINDOWPOS));
+            if ((windowpos.flags & 2u) == 0u && (windowpos.flags & 1u) == 0u && windowpos.cx > 0 && windowpos.cy > 0)
+            {
+                var rect = new Rect(windowpos.x, windowpos.y, windowpos.cx, windowpos.cy);
+                rect = rect.DeviceToLogicalUnits();
+                if (_useLogicalSizeForRestore)
+                {
+                    rect = _logicalSizeForRestore;
+                    _logicalSizeForRestore = Rect.Empty;
+                    _useLogicalSizeForRestore = false;
+                }
+
+                var logicalRect = GetOnScreenPosition(rect);
+                logicalRect = logicalRect.LogicalToDeviceUnits();
+                windowpos.x = (int)logicalRect.X;
+                windowpos.y = (int)logicalRect.Y;
+                Marshal.StructureToPtr(windowpos, lParam, true);
+            }
+        }
+
+        private static InteropValues.RECT GetClientRectRelativeToWindowRect(IntPtr hWnd)
+        {
+            InteropMethods.GetWindowRect(hWnd, out var rect);
+            InteropMethods.GetClientRect(hWnd, out var result);
+            var point = new InteropValues.POINT
+            {
+                X = 0,
+                Y = 0
+            };
+            InteropMethods.ClientToScreen(hWnd, ref point);
+            result.Offset(point.X - rect.Left, point.Y - rect.Top);
+            return result;
+        }
+
+        private void UpdateMaximizedClipRegion(IntPtr hWnd)
+        {
+            var clientRectRelativeToWindowRect = GetClientRectRelativeToWindowRect(hWnd);
+            if (_isNonClientStripVisible) clientRectRelativeToWindowRect.Bottom++;
+
+            var hRgn = InteropMethods.CreateRectRgnIndirect(ref clientRectRelativeToWindowRect);
+            InteropMethods.SetWindowRgn(hWnd, hRgn, InteropMethods.IsWindowVisible(hWnd));
+        }
+
+        private IntPtr ComputeRoundRectRegion(int left, int top, int width, int height, int cornerRadius)
+        {
+            var nWidthEllipse = (int)(2 * cornerRadius * DpiHelper.LogicalToDeviceUnitsScalingFactorX);
+            var nHeightEllipse = (int)(2 * cornerRadius * DpiHelper.LogicalToDeviceUnitsScalingFactorY);
+            return InteropMethods.CreateRoundRectRgn(left, top, left + width + 1, top + height + 1, nWidthEllipse,
+                nHeightEllipse);
+        }
+
+        protected void SetRoundRect(IntPtr hWnd, int width, int height)
+        {
+            var hRgn = ComputeRoundRectRegion(0, 0, width, height, 0);
+            InteropMethods.SetWindowRgn(hWnd, hRgn, InteropMethods.IsWindowVisible(hWnd));
+        }
+
+        protected virtual bool UpdateClipRegionCore(IntPtr hWnd, int showCmd, ClipRegionChangeType changeType, Int32Rect currentBounds)
+        {
+            if (showCmd == 3)
+            {
+                UpdateMaximizedClipRegion(hWnd);
+                return true;
+            }
+
+            if (changeType == ClipRegionChangeType.FromSize || changeType == ClipRegionChangeType.FromPropertyChange ||
+                _lastWindowPlacement != showCmd)
+            {
+                SetRoundRect(hWnd, currentBounds.Width, currentBounds.Height);
+                return true;
+            }
+
+            return false;
+        }
+
+        private void UpdateClipRegion(IntPtr hWnd, InteropValues.WINDOWPLACEMENT placement, ClipRegionChangeType changeType,
+            InteropValues.RECT currentBounds)
+        {
+            UpdateClipRegionCore(hWnd, placement.showCmd, changeType, currentBounds.ToInt32Rect());
+            _lastWindowPlacement = placement.showCmd;
+        }
+
+        protected virtual void OnWindowPosChanged(IntPtr hWnd, int showCmd, Int32Rect rcNormalPosition)
+        {
+        }
+
+        private void UpdateZOrderOfOwner(IntPtr hwndOwner)
+        {
+            var lastOwnedWindow = IntPtr.Zero;
+            InteropMethods.EnumThreadWindows(InteropMethods.GetCurrentThreadId(), delegate (IntPtr hwnd, IntPtr lParam)
+            {
+                if (InteropMethods.GetWindow(hwnd, 4) == hwndOwner) lastOwnedWindow = hwnd;
+                return true;
+            }, IntPtr.Zero);
+
+            if (lastOwnedWindow != IntPtr.Zero && InteropMethods.GetWindow(hwndOwner, 3) != lastOwnedWindow)
+                InteropMethods.SetWindowPos(hwndOwner, lastOwnedWindow, 0, 0, 0, 0, 19);
+        }
+
+        private void UpdateZOrderOfThisAndOwner()
+        {
+            if (_updatingZOrder) return;
+            try
+            {
+                _updatingZOrder = true;
+                var windowInteropHelper = new WindowInteropHelper(this);
+                var handle = windowInteropHelper.Handle;
+                foreach (var current in LoadedGlowWindows)
+                {
+                    var window = InteropMethods.GetWindow(current.Handle, 3);
+                    if (window != handle) InteropMethods.SetWindowPos(current.Handle, handle, 0, 0, 0, 0, 19);
+                    handle = current.Handle;
+                }
+
+                var owner = windowInteropHelper.Owner;
+                if (owner != IntPtr.Zero) UpdateZOrderOfOwner(owner);
+            }
+            finally
+            {
+                _updatingZOrder = false;
+            }
+        }
+
+        private void WmWindowPosChanged(IntPtr hWnd, IntPtr lParam)
+        {
+            try
+            {
+                var windowpos = (InteropValues.WINDOWPOS)Marshal.PtrToStructure(lParam, typeof(InteropValues.WINDOWPOS));
+                var windowPlacement = InteropMethods.GetWindowPlacement(hWnd);
+                var currentBounds = new InteropValues.RECT(windowpos.x, windowpos.y, windowpos.x + windowpos.cx,
+                    windowpos.y + windowpos.cy);
+                if ((windowpos.flags & 1u) != 1u)
+                {
+                    UpdateClipRegion(hWnd, windowPlacement, ClipRegionChangeType.FromSize, currentBounds);
+                }
+                else
+                {
+                    if ((windowpos.flags & 2u) != 2u)
+                        UpdateClipRegion(hWnd, windowPlacement, ClipRegionChangeType.FromPosition, currentBounds);
+                }
+
+                OnWindowPosChanged(hWnd, windowPlacement.showCmd, windowPlacement.rcNormalPosition.ToInt32Rect());
+                UpdateGlowWindowPositions((windowpos.flags & 64u) == 0u);
+                UpdateZOrderOfThisAndOwner();
+            }
+            catch (Win32Exception)
+            {
+            }
+        }
+
+        internal Rect GetOnScreenPosition(Rect floatRect)
+        {
+            var result = floatRect;
+            floatRect = floatRect.LogicalToDeviceUnits();
+            ScreenHelper.FindMaximumSingleMonitorRectangle(floatRect, out _, out var rect2);
+            if (!floatRect.IntersectsWith(rect2))
+            {
+                ScreenHelper.FindMonitorRectsFromPoint(InteropMethods.GetCursorPos(), out _, out rect2);
+                rect2 = rect2.DeviceToLogicalUnits();
+                if (result.Width > rect2.Width) result.Width = rect2.Width;
+                if (result.Height > rect2.Height) result.Height = rect2.Height;
+                if (rect2.Right <= result.X) result.X = rect2.Right - result.Width;
+                if (rect2.Left > result.X + result.Width) result.X = rect2.Left;
+                if (rect2.Bottom <= result.Y) result.Y = rect2.Bottom - result.Height;
+                if (rect2.Top > result.Y + result.Height) result.Y = rect2.Top;
+            }
+
+            return result;
+        }
+
+        private static InteropValues.MONITORINFO MonitorInfoFromWindow(IntPtr hWnd)
+        {
+            var hMonitor = InteropMethods.MonitorFromWindow(hWnd, 2);
+            var result = default(InteropValues.MONITORINFO);
+            result.cbSize = (uint)Marshal.SizeOf(typeof(InteropValues.MONITORINFO));
+            InteropMethods.GetMonitorInfo(hMonitor, ref result);
+            return result;
+        }
+
+        private InteropValues.WINDOWINFO GetWindowInfo(IntPtr hWnd)
+        {
+            var windowInfo = default(InteropValues.WINDOWINFO);
+            windowInfo.cbSize = Marshal.SizeOf(windowInfo);
+            InteropMethods.GetWindowInfo(hWnd, ref windowInfo);
+            return windowInfo;
+        }
+
+        private IntPtr WmNcCalcSize(IntPtr hWnd, IntPtr wParam, IntPtr lParam, ref bool handled)
+        {
+            _isNonClientStripVisible = false;
+            var windowPlacement = InteropMethods.GetWindowPlacement(hWnd);
+            var flag = windowPlacement.showCmd == 3;
+            if (flag)
+            {
+                var rect = (InteropValues.RECT)Marshal.PtrToStructure(lParam, typeof(InteropValues.RECT));
+                InteropMethods.DefWindowProc(hWnd, 131, wParam, lParam);
+                var rect2 = (InteropValues.RECT)Marshal.PtrToStructure(lParam, typeof(InteropValues.RECT));
+                var monitorinfo = MonitorInfoFromWindow(hWnd);
+                if (monitorinfo.rcMonitor.Height == monitorinfo.rcWork.Height &&
+                    monitorinfo.rcMonitor.Width == monitorinfo.rcWork.Width)
+                {
+                    _isNonClientStripVisible = true;
+                    rect2.Bottom--;
+                }
+
+                rect2.Top = rect.Top + (int)GetWindowInfo(hWnd).cyWindowBorders;
+                Marshal.StructureToPtr(rect2, lParam, true);
+            }
+
+            handled = true;
+            return IntPtr.Zero;
+        }
+
+        private IntPtr WmNcHitTest(IntPtr hWnd, IntPtr lParam, ref bool handled)
+        {
+            if (PresentationSource.FromDependencyObject(this) == null) return new IntPtr(0);
+
+            var point = new Point(InteropMethods.GetXLParam(lParam.ToInt32()),
+                InteropMethods.GetYLParam(lParam.ToInt32()));
+            var point2 = PointFromScreen(point);
+            DependencyObject visualHit = null;
+            VisualHelper.HitTestVisibleElements(this, delegate (HitTestResult target)
+            {
+                visualHit = target.VisualHit;
+                return HitTestResultBehavior.Stop;
+            }, new PointHitTestParameters(point2));
+
+            var num = 0;
+            while (visualHit != null)
+            {
+                //var nonClientArea = visualHit as INonClientArea;
+                //if (nonClientArea != null)
+                //{
+                //    num = nonClientArea.HitTest(point);
+                //    if (num != 0) break;
+                //}
+
+                visualHit = visualHit.GetVisualOrLogicalParent();
+            }
+
+            if (num == 0) num = 1;
+            handled = true;
+            return new IntPtr(num);
+        }
+
+        private IntPtr WmNcActivate(IntPtr hWnd, IntPtr wParam, IntPtr lParam, ref bool handled)
+        {
+            handled = true;
+            return InteropMethods.DefWindowProc(hWnd, 134, wParam, InteropMethods.HRGN_NONE);
+        }
+
+        private static void RaiseNonClientMouseMessageAsClient(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam)
+        {
+            var point = new InteropValues.POINT
+            {
+                X = InteropMethods.GetXLParam(lParam.ToInt32()),
+                Y = InteropMethods.GetYLParam(lParam.ToInt32())
+            };
+
+            InteropMethods.ScreenToClient(hWnd, ref point);
+            InteropMethods.SendMessage(hWnd, msg + 513 - 161, new IntPtr(PressedMouseButtons),
+                InteropMethods.MakeParam(point.X, point.Y));
+        }
+
+        private bool IsAeroSnappedToMonitor(IntPtr hWnd)
+        {
+            var monitorinfo = MonitorInfoFromWindow(hWnd);
+            var logicalRect = new Rect(Left, Top, Width, Height);
+            logicalRect = logicalRect.LogicalToDeviceUnits();
+            return MathHelper.AreClose(monitorinfo.rcWork.Height, logicalRect.Height) && MathHelper.AreClose(monitorinfo.rcWork.Top, logicalRect.Top);
+        }
+
+        private void WmSysCommand(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            var num = InteropMethods.GET_SC_WPARAM(wParam);
+            if (num == 61456)
+                InteropMethods.RedrawWindow(hWnd, IntPtr.Zero, IntPtr.Zero,
+                    InteropValues.RedrawWindowFlags.Invalidate | InteropValues.RedrawWindowFlags.NoChildren |
+                    InteropValues.RedrawWindowFlags.UpdateNow | InteropValues.RedrawWindowFlags.Frame);
+            if ((num == 61488 || num == 61472 || num == 61456 || num == 61440) && WindowState == WindowState.Normal &&
+                !IsAeroSnappedToMonitor(hWnd)) _logicalSizeForRestore = new Rect(Left, Top, Width, Height);
+            if (num == 61456 && WindowState == WindowState.Maximized && _logicalSizeForRestore == Rect.Empty)
+                _logicalSizeForRestore = new Rect(Left, Top, Width, Height);
+            if (num == 61728 && WindowState != WindowState.Minimized && _logicalSizeForRestore.Width > 0.0 &&
+                _logicalSizeForRestore.Height > 0.0)
+            {
+                Left = _logicalSizeForRestore.Left;
+                Top = _logicalSizeForRestore.Top;
+                Width = _logicalSizeForRestore.Width;
+                Height = _logicalSizeForRestore.Height;
+                _useLogicalSizeForRestore = true;
+            }
+        }
+
+        private IntPtr CallDefWindowProcWithoutVisibleStyle(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        {
+            var flag = VisualHelper.ModifyStyle(hWnd, 268435456, 0);
+            var result = InteropMethods.DefWindowProc(hWnd, msg, wParam, lParam);
+            if (flag) VisualHelper.ModifyStyle(hWnd, 0, 268435456);
+            handled = true;
+            return result;
+        }
+
+        protected virtual IntPtr HwndSourceHook(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        {
+            if (msg <= 71)
+            {
+                if (msg == 6)
+                {
+                    WmActivate(wParam, lParam);
+                    goto IL_11C;
+                }
+
+                if (msg != 12)
+                    switch (msg)
+                    {
+                        case 70:
+                            WmWindowPosChanging(hWnd, lParam);
+                            goto IL_11C;
+                        case 71:
+                            WmWindowPosChanged(hWnd, lParam);
+                            goto IL_11C;
+                        default:
+                            goto IL_11C;
+                    }
+            }
+            else
+            {
+                if (msg <= 166)
+                    switch (msg)
+                    {
+                        case 128:
+                            break;
+                        case 129:
+                        case 130:
+                            goto IL_11C;
+                        case 131:
+                            return WmNcCalcSize(hWnd, wParam, lParam, ref handled);
+                        case 132:
+                            return WmNcHitTest(hWnd, lParam, ref handled);
+                        //case 133:
+                        //    return WmNcPaint(hWnd, wParam, lParam, ref handled);
+                        case 134:
+                            return WmNcActivate(hWnd, wParam, lParam, ref handled);
+                        default:
+                            switch (msg)
+                            {
+                                case 164:
+                                case 165:
+                                case 166:
+                                    RaiseNonClientMouseMessageAsClient(hWnd, msg, wParam, lParam);
+                                    handled = true;
+                                    goto IL_11C;
+                                default:
+                                    goto IL_11C;
+                            }
+                    }
+                else
+                    switch (msg)
+                    {
+                        case 174:
+                        case 175:
+                            handled = true;
+                            goto IL_11C;
+                        default:
+                            if (msg != 274) goto IL_11C;
+                            WmSysCommand(hWnd, wParam, lParam);
+                            goto IL_11C;
+                    }
+            }
+
+            return CallDefWindowProcWithoutVisibleStyle(hWnd, msg, wParam, lParam, ref handled);
+        IL_11C:
+            return IntPtr.Zero;
+        }
+
+        private void CreateGlowWindowHandles()
+        {
+            for (var i = 0; i < _glowEdges.Length; i++) GetOrCreateGlowWindow(i).EnsureHandle();
+        }
+
+        protected override void OnActivated(EventArgs e)
+        {
+            UpdateGlowActiveState();
+            base.OnActivated(e);
+        }
+
+        protected override void OnDeactivated(EventArgs e)
+        {
+            UpdateGlowActiveState();
+            base.OnDeactivated(e);
+        }
+
+        protected override void OnClosed(EventArgs e)
+        {
+            StopTimer();
+            DestroyGlowWindows();
+            base.OnClosed(e);
+        }
+
+        protected override void OnSourceInitialized(EventArgs e)
+        {
+            var hwndSource = HwndSource.FromHwnd(new WindowInteropHelper(this).Handle);
+            if (hwndSource != null)
+            {
+                hwndSource.AddHook(HwndSourceHook);
+                CreateGlowWindowHandles();
+            }
+
+            base.OnSourceInitialized(e);
+        }
+
+        protected enum ClipRegionChangeType
+        {
+            FromSize,
+            FromPosition,
+            FromPropertyChange,
+            FromUndockSingleTab
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/Window.cs b/src/Shared/HandyControl_Shared/Controls/Window/Window.cs
index 747b45f9..fecf17ba 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/Window.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/Window.cs
@@ -92,6 +92,11 @@ namespace HandyControl.Controls
 
         private ResizeMode _tempResizeMode;
 
+        static Window()
+        {
+            StyleProperty.OverrideMetadata(typeof(Window), new FrameworkPropertyMetadata(Application.Current.FindResource(ResourceToken.WindowWin10)));
+        }
+
         public Window()
         {
 #if netle40
diff --git a/src/Shared/HandyControl_Shared/Data/DisposableObject.cs b/src/Shared/HandyControl_Shared/Data/DisposableObject.cs
new file mode 100644
index 00000000..482ede5e
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Data/DisposableObject.cs
@@ -0,0 +1,69 @@
+using System;
+
+namespace HandyControl.Data
+{
+    public class DisposableObject : IDisposable
+    {
+        private EventHandler _disposing;
+
+        public bool IsDisposed { get; private set; }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        ~DisposableObject()
+        {
+            Dispose(false);
+        }
+
+        public event EventHandler Disposing
+        {
+            add
+            {
+                ThrowIfDisposed();
+                _disposing += value;
+            }
+            remove
+            {
+                _disposing -= value;
+            }
+        }
+
+        protected void ThrowIfDisposed()
+        {
+            if (IsDisposed) throw new ObjectDisposedException(GetType().Name);
+        }
+
+        protected void Dispose(bool disposing)
+        {
+            if (IsDisposed) return;
+
+            try
+            {
+                if (disposing)
+                {
+                    _disposing?.Invoke(this, EventArgs.Empty);
+                    _disposing = null;
+                    DisposeManagedResources();
+                }
+
+                DisposeNativeResources();
+            }
+            finally
+            {
+                IsDisposed = true;
+            }
+        }
+
+        protected virtual void DisposeManagedResources()
+        {
+        }
+
+        protected virtual void DisposeNativeResources()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/GlowWindow/ChangeScope.cs b/src/Shared/HandyControl_Shared/Data/GlowWindow/ChangeScope.cs
new file mode 100644
index 00000000..699461c2
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Data/GlowWindow/ChangeScope.cs
@@ -0,0 +1,21 @@
+using HandyControl.Controls;
+
+namespace HandyControl.Data
+{
+    internal class ChangeScope : DisposableObject
+    {
+        private readonly GlowWindow _window;
+
+        public ChangeScope(GlowWindow window)
+        {
+            _window = window;
+            _window.DeferGlowChangesCount++;
+        }
+
+        protected override void DisposeManagedResources()
+        {
+            _window.DeferGlowChangesCount--;
+            if (_window.DeferGlowChangesCount == 0) _window.EndDeferGlowChanges();
+        }
+    }
+}
diff --git a/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmap.cs b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmap.cs
new file mode 100644
index 00000000..66651251
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmap.cs
@@ -0,0 +1,113 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using HandyControl.Tools.Interop;
+
+namespace HandyControl.Data
+{
+    internal class GlowBitmap : DisposableObject
+    {
+        internal const int GlowBitmapPartCount = 16;
+
+        private const int BytesPerPixelBgra32 = 4;
+
+        private static readonly CachedBitmapInfo[] _transparencyMasks = new CachedBitmapInfo[GlowBitmapPartCount];
+
+        private readonly InteropValues.BITMAPINFO _bitmapInfo;
+
+        private readonly IntPtr _pbits;
+
+        internal GlowBitmap(IntPtr hdcScreen, int width, int height)
+        {
+            _bitmapInfo.biSize = Marshal.SizeOf(typeof(InteropValues.BITMAPINFOHEADER));
+            _bitmapInfo.biPlanes = 1;
+            _bitmapInfo.biBitCount = 32;
+            _bitmapInfo.biCompression = 0;
+            _bitmapInfo.biXPelsPerMeter = 0;
+            _bitmapInfo.biYPelsPerMeter = 0;
+            _bitmapInfo.biWidth = width;
+            _bitmapInfo.biHeight = -height;
+
+            Handle = InteropMethods.CreateDIBSection(
+                hdcScreen,
+                ref _bitmapInfo,
+                0u,
+                out _pbits,
+                IntPtr.Zero,
+                0u);
+        }
+
+        internal IntPtr Handle { get; }
+
+        internal IntPtr DIBits => _pbits;
+
+        internal int Width => _bitmapInfo.biWidth;
+
+        internal int Height => -_bitmapInfo.biHeight;
+
+        protected override void DisposeNativeResources() => InteropMethods.DeleteObject(Handle);
+
+        private static byte PremultiplyAlpha(byte channel, byte alpha) => (byte)(channel * alpha / 255.0);
+
+        internal static GlowBitmap Create(GlowDrawingContext drawingContext, GlowBitmapPart bitmapPart, Color color)
+        {
+            var orCreateAlphaMask =
+                GetOrCreateAlphaMask(bitmapPart);
+
+            var glowBitmap =
+                new GlowBitmap(
+                    drawingContext.ScreenDC,
+                    orCreateAlphaMask.Width,
+                    orCreateAlphaMask.Height);
+
+            for (var i = 0; i < orCreateAlphaMask.DIBits.Length; i += BytesPerPixelBgra32)
+            {
+                var b = orCreateAlphaMask.DIBits[i + 3];
+                var val = PremultiplyAlpha(color.R, b);
+                var val2 = PremultiplyAlpha(color.G, b);
+                var val3 = PremultiplyAlpha(color.B, b);
+                Marshal.WriteByte(glowBitmap.DIBits, i, val3);
+                Marshal.WriteByte(glowBitmap.DIBits, i + 1, val2);
+                Marshal.WriteByte(glowBitmap.DIBits, i + 2, val);
+                Marshal.WriteByte(glowBitmap.DIBits, i + 3, b);
+            }
+
+            return glowBitmap;
+        }
+
+        private static CachedBitmapInfo GetOrCreateAlphaMask(GlowBitmapPart bitmapPart)
+        {
+            if (_transparencyMasks[(int)bitmapPart] == null)
+            {
+                var bitmapImage = new BitmapImage(new Uri($"pack://application:,,,/HandyControl;Component/Resources/Images/GlowWindow/{bitmapPart}.png"));
+
+                var array = new byte[BytesPerPixelBgra32 * bitmapImage.PixelWidth * bitmapImage.PixelHeight];
+                var stride = BytesPerPixelBgra32 * bitmapImage.PixelWidth;
+                bitmapImage.CopyPixels(array, stride, 0);
+
+                _transparencyMasks[(int)bitmapPart] =
+                    new CachedBitmapInfo(
+                        array,
+                        bitmapImage.PixelWidth,
+                        bitmapImage.PixelHeight);
+            }
+
+            return _transparencyMasks[(int)bitmapPart];
+        }
+
+        private sealed class CachedBitmapInfo
+        {
+            internal readonly byte[] DIBits;
+            internal readonly int Height;
+            internal readonly int Width;
+
+            internal CachedBitmapInfo(byte[] diBits, int width, int height)
+            {
+                Width = width;
+                Height = height;
+                DIBits = diBits;
+            }
+        }
+    }
+}
diff --git a/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmapPart.cs b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmapPart.cs
new file mode 100644
index 00000000..b1c0b061
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmapPart.cs
@@ -0,0 +1,22 @@
+namespace HandyControl.Data
+{
+    internal enum GlowBitmapPart
+    {
+        CornerTopLeft,
+        CornerTopRight,
+        CornerBottomLeft,
+        CornerBottomRight,
+        TopLeft,
+        Top,
+        TopRight,
+        LeftTop,
+        Left,
+        LeftBottom,
+        BottomLeft,
+        Bottom,
+        BottomRight,
+        RightTop,
+        Right,
+        RightBottom
+    }
+}
diff --git a/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowDrawingContext.cs b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowDrawingContext.cs
new file mode 100644
index 00000000..6d9b7388
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowDrawingContext.cs
@@ -0,0 +1,51 @@
+using System;
+using HandyControl.Tools.Interop;
+
+namespace HandyControl.Data
+{
+    internal class GlowDrawingContext : DisposableObject
+    {
+        private readonly GlowBitmap _windowBitmap;
+        
+        internal InteropValues.BLENDFUNCTION Blend;
+
+        internal GlowDrawingContext(int width, int height)
+        {
+            ScreenDC = InteropMethods.GetDC(IntPtr.Zero);
+            if (ScreenDC == IntPtr.Zero) return;
+            WindowDC = InteropMethods.CreateCompatibleDC(ScreenDC);
+            if (WindowDC == IntPtr.Zero) return;
+            BackgroundDC = InteropMethods.CreateCompatibleDC(ScreenDC);
+            if (BackgroundDC == IntPtr.Zero) return;
+            Blend.BlendOp = 0;
+            Blend.BlendFlags = 0;
+            Blend.SourceConstantAlpha = 255;
+            Blend.AlphaFormat = 1;
+            _windowBitmap = new GlowBitmap(ScreenDC, width, height);
+            InteropMethods.SelectObject(WindowDC, _windowBitmap.Handle);
+        }
+
+        internal bool IsInitialized => 
+            ScreenDC != IntPtr.Zero && WindowDC != IntPtr.Zero && 
+            BackgroundDC != IntPtr.Zero && _windowBitmap != null;
+
+        internal IntPtr ScreenDC { get; }
+
+        internal IntPtr WindowDC { get; }
+
+        internal IntPtr BackgroundDC { get; }
+
+        internal int Width => _windowBitmap.Width;
+
+        internal int Height => _windowBitmap.Height;
+
+        protected override void DisposeManagedResources() => _windowBitmap.Dispose();
+
+        protected override void DisposeNativeResources()
+        {
+            if (ScreenDC != IntPtr.Zero) InteropMethods.ReleaseDC(IntPtr.Zero, ScreenDC);
+            if (WindowDC != IntPtr.Zero) InteropMethods.DeleteDC(WindowDC);
+            if (BackgroundDC != IntPtr.Zero) InteropMethods.DeleteDC(BackgroundDC);
+        }
+    }
+}
diff --git a/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowEdge.cs b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowEdge.cs
new file mode 100644
index 00000000..0fd7818a
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowEdge.cs
@@ -0,0 +1,587 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Windows.Controls;
+using System.Windows.Interop;
+using System.Windows.Media;
+using HandyControl.Controls;
+using HandyControl.Tools.Interop;
+
+namespace HandyControl.Data
+{
+    internal class GlowEdge : HwndWrapper
+    {
+        private const string GlowEdgeClassName = "HandyControlGlowEdge";
+        
+        private const int GlowDepth = 9;
+        
+        private const int CornerGripThickness = 18;
+
+        private static ushort _sharedWindowClassAtom;
+        
+        // ReSharper disable once NotAccessedField.Local
+        private static InteropValues.WndProc _sharedWndProc;
+
+        private readonly GlowBitmap[] _activeGlowBitmaps = new GlowBitmap[16];
+        
+        private readonly GlowBitmap[] _inactiveGlowBitmaps = new GlowBitmap[16];
+        
+        private readonly Dock _orientation;
+        
+        private readonly GlowWindow _targetWindow;
+        
+        private Color _activeGlowColor = Colors.Transparent;
+        
+        private int _height;
+        
+        private Color _inactiveGlowColor = Colors.Transparent;
+        
+        private FieldInvalidationTypes _invalidatedValues;
+        
+        private bool _isActive;
+        
+        private bool _isVisible;
+        
+        private int _left;
+        
+        private bool _pendingDelayRender;
+        
+        private int _top;
+        
+        private int _width;
+
+        internal static long CreatedGlowEdges { get; private set; }
+
+        internal static long DisposedGlowEdges { get; private set; }
+
+        internal GlowEdge(GlowWindow owner, Dock orientation)
+        {
+            _targetWindow = owner ?? throw new ArgumentNullException(nameof(owner));
+            _orientation = orientation;
+            CreatedGlowEdges += 1L;
+        }
+
+        private bool IsDeferringChanges => _targetWindow.DeferGlowChangesCount > 0;
+
+        private static ushort SharedWindowClassAtom
+        {
+            get
+            {
+                if (_sharedWindowClassAtom == 0)
+                {
+                    var wndclass = default(InteropValues.WNDCLASS);
+                    
+                    wndclass.cbClsExtra = 0;
+                    wndclass.cbWndExtra = 0;
+                    wndclass.hbrBackground = IntPtr.Zero;
+                    wndclass.hCursor = IntPtr.Zero;
+                    wndclass.hIcon = IntPtr.Zero;
+                    wndclass.lpfnWndProc = _sharedWndProc = InteropMethods.DefWindowProc;
+                    wndclass.lpszClassName = GlowEdgeClassName;
+                    wndclass.lpszMenuName = null;
+                    wndclass.style = 0u;
+
+                    _sharedWindowClassAtom = InteropMethods.RegisterClass(ref wndclass);
+                }
+
+                return _sharedWindowClassAtom;
+            }
+        }
+
+        internal bool IsVisible
+        {
+            get => _isVisible;
+            set => UpdateProperty(ref _isVisible, value, FieldInvalidationTypes.Render | FieldInvalidationTypes.Visibility);
+        }
+
+        internal int Left
+        {
+            get => _left;
+            set => UpdateProperty(ref _left, value, FieldInvalidationTypes.Location);
+        }
+
+        internal int Top
+        {
+            get => _top;
+            set => UpdateProperty(ref _top, value, FieldInvalidationTypes.Location);
+        }
+
+        internal int Width
+        {
+            get => _width;
+            set => UpdateProperty( ref _width, value, FieldInvalidationTypes.Size | FieldInvalidationTypes.Render);
+        }
+
+        internal int Height
+        {
+            get => _height;
+            set => UpdateProperty(ref _height, value, FieldInvalidationTypes.Size | FieldInvalidationTypes.Render);
+        }
+
+        internal bool IsActive
+        {
+            get => _isActive;
+            set => UpdateProperty(ref _isActive, value, FieldInvalidationTypes.Render);
+        }
+
+        internal Color ActiveGlowColor
+        {
+            get => _activeGlowColor;
+            set => UpdateProperty(ref _activeGlowColor, value, FieldInvalidationTypes.ActiveColor | FieldInvalidationTypes.Render);
+        }
+
+        internal Color InactiveGlowColor
+        {
+            get => _inactiveGlowColor;
+            set => UpdateProperty(ref _inactiveGlowColor, value, FieldInvalidationTypes.InactiveColor | FieldInvalidationTypes.Render);
+        }
+
+        private IntPtr TargetWindowHandle => new WindowInteropHelper(_targetWindow).Handle;
+
+        protected override bool IsWindowSubclassed => true;
+
+        private bool IsPositionValid => (_invalidatedValues & (FieldInvalidationTypes.Location | FieldInvalidationTypes.Size | FieldInvalidationTypes.Visibility)) == FieldInvalidationTypes.None;
+
+        private void UpdateProperty<T>(ref T field, T value, FieldInvalidationTypes invalidatedValues) where T : struct
+        {
+            if (!field.Equals(value))
+            {
+                field = value;
+                _invalidatedValues |= invalidatedValues;
+                if (!IsDeferringChanges) CommitChanges();
+            }
+        }
+
+        protected override ushort CreateWindowClassCore() => SharedWindowClassAtom;
+
+        protected override void DestroyWindowClassCore()
+        {
+        }
+
+        protected override IntPtr CreateWindowCore()
+        {
+            return InteropMethods.CreateWindowEx(
+                524416,
+                new IntPtr(WindowClassAtom),
+                string.Empty,
+                -2046820352,
+                0,
+                0,
+                0,
+                0,
+                new WindowInteropHelper(_targetWindow).Owner,
+                IntPtr.Zero,
+                IntPtr.Zero,
+                IntPtr.Zero);
+        }
+
+        internal void ChangeOwner(IntPtr newOwner) => InteropMethods.SetWindowLongPtr(Handle, InteropValues.GWLP.HWNDPARENT, newOwner);
+
+        protected override IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam)
+        {
+            if (msg <= 70)
+            {
+                if (msg == 6) return IntPtr.Zero;
+                if (msg == 70)
+                {
+                    var windowpos = (InteropValues.WINDOWPOS)Marshal.PtrToStructure(lParam, typeof(InteropValues.WINDOWPOS));
+                    windowpos.flags |= 16u;
+                    Marshal.StructureToPtr(windowpos, lParam, true);
+                }
+            }
+            else
+            {
+                if (msg != 126)
+                {
+                    if (msg == 132) return new IntPtr(WmNcHitTest(lParam));
+                    switch (msg)
+                    {
+                        case 161:
+                        case 163:
+                        case 164:
+                        case 166:
+                        case 167:
+                        case 169:
+                        case 171:
+                        case 173:
+                            {
+                                var targetWindowHandle = TargetWindowHandle;
+                                InteropMethods.SendMessage(targetWindowHandle, 6, new IntPtr(2), IntPtr.Zero);
+                                InteropMethods.SendMessage(targetWindowHandle, msg, wParam, IntPtr.Zero);
+                                return IntPtr.Zero;
+                            }
+                    }
+                }
+                else
+                {
+                    if (IsVisible) RenderLayeredWindow();
+                }
+            }
+
+            return base.WndProc(hwnd, msg, wParam, lParam);
+        }
+
+        private int WmNcHitTest(IntPtr lParam)
+        {
+            var xLParam = InteropMethods.GetXLParam(lParam.ToInt32());
+            var yLParam = InteropMethods.GetYLParam(lParam.ToInt32());
+            InteropMethods.GetWindowRect(Handle, out var rect);
+            switch (_orientation)
+            {
+                case Dock.Left:
+                    if (yLParam - CornerGripThickness < rect.Top) return 13;
+                    if (yLParam + CornerGripThickness > rect.Bottom) return 16;
+                    return 10;
+                case Dock.Top:
+                    if (xLParam - CornerGripThickness < rect.Left) return 13;
+                    if (xLParam + CornerGripThickness > rect.Right) return 14;
+                    return 12;
+                case Dock.Right:
+                    if (yLParam - CornerGripThickness < rect.Top) return 14;
+                    if (yLParam + CornerGripThickness > rect.Bottom) return 17;
+                    return 11;
+                default:
+                    if (xLParam - CornerGripThickness < rect.Left) return 16;
+                    if (xLParam + CornerGripThickness > rect.Right) return 17;
+                    return 15;
+            }
+        }
+
+        internal void CommitChanges()
+        {
+            InvalidateCachedBitmaps();
+            UpdateWindowPosCore();
+            UpdateLayeredWindowCore();
+            _invalidatedValues = FieldInvalidationTypes.None;
+        }
+
+        private void InvalidateCachedBitmaps()
+        {
+            if (_invalidatedValues.HasFlag(FieldInvalidationTypes.ActiveColor)) ClearCache(_activeGlowBitmaps);
+            if (_invalidatedValues.HasFlag(FieldInvalidationTypes.InactiveColor)) ClearCache(_inactiveGlowBitmaps);
+        }
+
+        private void UpdateWindowPosCore()
+        {
+            if (_invalidatedValues.HasFlag(FieldInvalidationTypes.Location) ||
+                _invalidatedValues.HasFlag(FieldInvalidationTypes.Size) ||
+                _invalidatedValues.HasFlag(FieldInvalidationTypes.Visibility))
+            {
+                var num = 532;
+                if (_invalidatedValues.HasFlag(FieldInvalidationTypes.Visibility))
+                {
+                    if (IsVisible)
+                        num |= 64;
+                    else
+                        num |= 131;
+                }
+
+                if (!_invalidatedValues.HasFlag(FieldInvalidationTypes.Location)) num |= 2;
+                if (!_invalidatedValues.HasFlag(FieldInvalidationTypes.Size)) num |= 1;
+                InteropMethods.SetWindowPos(Handle, IntPtr.Zero, Left, Top, Width, Height, num);
+            }
+        }
+
+        private void UpdateLayeredWindowCore()
+        {
+            if (IsVisible && _invalidatedValues.HasFlag(FieldInvalidationTypes.Render))
+            {
+                if (IsPositionValid)
+                {
+                    BeginDelayedRender();
+                    return;
+                }
+
+                CancelDelayedRender();
+                RenderLayeredWindow();
+            }
+        }
+
+        private void BeginDelayedRender()
+        {
+            if (!_pendingDelayRender)
+            {
+                _pendingDelayRender = true;
+                CompositionTarget.Rendering += CommitDelayedRender;
+            }
+        }
+
+        private void CancelDelayedRender()
+        {
+            if (_pendingDelayRender)
+            {
+                _pendingDelayRender = false;
+                CompositionTarget.Rendering -= CommitDelayedRender;
+            }
+        }
+
+        private void CommitDelayedRender(object sender, EventArgs e)
+        {
+            CancelDelayedRender();
+            if (IsVisible) RenderLayeredWindow();
+        }
+
+        private void RenderLayeredWindow()
+        {
+            using var glowDrawingContext = new GlowDrawingContext(Width, Height);
+            if (glowDrawingContext.IsInitialized)
+            {
+                switch (_orientation)
+                {
+                    case Dock.Left:
+                        DrawLeft(glowDrawingContext);
+                        break;
+                    case Dock.Top:
+                        DrawTop(glowDrawingContext);
+                        break;
+                    case Dock.Right:
+                        DrawRight(glowDrawingContext);
+                        break;
+                    default:
+                        DrawBottom(glowDrawingContext);
+                        break;
+                }
+
+                var point = new InteropValues.POINT
+                {
+                    X = Left,
+                    Y = Top
+                };
+                var size = new InteropValues.SIZE
+                {
+                    cx = Width,
+                    cy = Height
+                };
+                var point2 = new InteropValues.POINT
+                {
+                    X = 0,
+                    Y = 0
+                };
+
+                InteropMethods.UpdateLayeredWindow(
+                    Handle,
+                    glowDrawingContext.ScreenDC,
+                    ref point,
+                    ref size,
+                    glowDrawingContext.WindowDC,
+                    ref point2,
+                    0u,
+                    ref glowDrawingContext.Blend,
+                    2u);
+            }
+        }
+
+        private GlowBitmap GetOrCreateBitmap(GlowDrawingContext drawingContext, GlowBitmapPart bitmapPart)
+        {
+            GlowBitmap[] array;
+            Color color;
+            if (IsActive)
+            {
+                array = _activeGlowBitmaps;
+                color = ActiveGlowColor;
+            }
+            else
+            {
+                array = _inactiveGlowBitmaps;
+                color = InactiveGlowColor;
+            }
+
+            return array[(int) bitmapPart] ?? (array[(int) bitmapPart] = GlowBitmap.Create(drawingContext, bitmapPart, color));
+        }
+
+        private void ClearCache(GlowBitmap[] cache)
+        {
+            for (var i = 0; i < cache.Length; i++)
+                using (cache[i])
+                {
+                    cache[i] = null;
+                }
+        }
+
+        protected override void DisposeManagedResources()
+        {
+            ClearCache(_activeGlowBitmaps);
+            ClearCache(_inactiveGlowBitmaps);
+        }
+
+        protected override void DisposeNativeResources()
+        {
+            base.DisposeNativeResources();
+            DisposedGlowEdges += 1L;
+        }
+
+        private void DrawLeft(GlowDrawingContext drawingContext)
+        {
+            var orCreateBitmap = GetOrCreateBitmap(drawingContext, GlowBitmapPart.CornerTopLeft);
+            var orCreateBitmap2 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.LeftTop);
+            var orCreateBitmap3 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.Left);
+            var orCreateBitmap4 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.LeftBottom);
+            var orCreateBitmap5 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.CornerBottomLeft);
+            var height = orCreateBitmap.Height;
+            var num = height + orCreateBitmap2.Height;
+            var num2 = drawingContext.Height - orCreateBitmap5.Height;
+            var num3 = num2 - orCreateBitmap4.Height;
+            var num4 = num3 - num;
+            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap.Handle);
+            InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, 0, orCreateBitmap.Width, orCreateBitmap.Height,
+                drawingContext.BackgroundDC, 0, 0, orCreateBitmap.Width, orCreateBitmap.Height,
+                drawingContext.Blend);
+            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap2.Handle);
+            InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, height, orCreateBitmap2.Width,
+                orCreateBitmap2.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap2.Width,
+                orCreateBitmap2.Height, drawingContext.Blend);
+            if (num4 > 0)
+            {
+                InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap3.Handle);
+                InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, num, orCreateBitmap3.Width, num4,
+                    drawingContext.BackgroundDC, 0, 0, orCreateBitmap3.Width, orCreateBitmap3.Height,
+                    drawingContext.Blend);
+            }
+
+            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap4.Handle);
+            InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, num3, orCreateBitmap4.Width,
+                orCreateBitmap4.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap4.Width,
+                orCreateBitmap4.Height, drawingContext.Blend);
+            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap5.Handle);
+            InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, num2, orCreateBitmap5.Width,
+                orCreateBitmap5.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap5.Width,
+                orCreateBitmap5.Height, drawingContext.Blend);
+        }
+
+        private void DrawRight(GlowDrawingContext drawingContext)
+        {
+            var orCreateBitmap = GetOrCreateBitmap(drawingContext, GlowBitmapPart.CornerTopRight);
+            var orCreateBitmap2 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.RightTop);
+            var orCreateBitmap3 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.Right);
+            var orCreateBitmap4 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.RightBottom);
+            var orCreateBitmap5 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.CornerBottomRight);
+            var height = orCreateBitmap.Height;
+            var num = height + orCreateBitmap2.Height;
+            var num2 = drawingContext.Height - orCreateBitmap5.Height;
+            var num3 = num2 - orCreateBitmap4.Height;
+            var num4 = num3 - num;
+            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap.Handle);
+            InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, 0, orCreateBitmap.Width, orCreateBitmap.Height,
+                drawingContext.BackgroundDC, 0, 0, orCreateBitmap.Width, orCreateBitmap.Height,
+                drawingContext.Blend);
+            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap2.Handle);
+            InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, height, orCreateBitmap2.Width,
+                orCreateBitmap2.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap2.Width,
+                orCreateBitmap2.Height, drawingContext.Blend);
+            if (num4 > 0)
+            {
+                InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap3.Handle);
+                InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, num, orCreateBitmap3.Width, num4,
+                    drawingContext.BackgroundDC, 0, 0, orCreateBitmap3.Width, orCreateBitmap3.Height,
+                    drawingContext.Blend);
+            }
+
+            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap4.Handle);
+            InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, num3, orCreateBitmap4.Width,
+                orCreateBitmap4.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap4.Width,
+                orCreateBitmap4.Height, drawingContext.Blend);
+            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap5.Handle);
+            InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, num2, orCreateBitmap5.Width,
+                orCreateBitmap5.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap5.Width,
+                orCreateBitmap5.Height, drawingContext.Blend);
+        }
+
+        private void DrawTop(GlowDrawingContext drawingContext)
+        {
+            var orCreateBitmap = GetOrCreateBitmap(drawingContext, GlowBitmapPart.TopLeft);
+            var orCreateBitmap2 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.Top);
+            var orCreateBitmap3 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.TopRight);
+            var num2 = GlowDepth + orCreateBitmap.Width;
+            var num3 = drawingContext.Width - GlowDepth - orCreateBitmap3.Width;
+            var num4 = num3 - num2;
+            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap.Handle);
+            InteropMethods.AlphaBlend(drawingContext.WindowDC, GlowDepth, 0, orCreateBitmap.Width, orCreateBitmap.Height,
+                drawingContext.BackgroundDC, 0, 0, orCreateBitmap.Width, orCreateBitmap.Height,
+                drawingContext.Blend);
+            if (num4 > 0)
+            {
+                InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap2.Handle);
+                InteropMethods.AlphaBlend(drawingContext.WindowDC, num2, 0, num4, orCreateBitmap2.Height,
+                    drawingContext.BackgroundDC, 0, 0, orCreateBitmap2.Width, orCreateBitmap2.Height,
+                    drawingContext.Blend);
+            }
+
+            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap3.Handle);
+            InteropMethods.AlphaBlend(drawingContext.WindowDC, num3, 0, orCreateBitmap3.Width,
+                orCreateBitmap3.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap3.Width,
+                orCreateBitmap3.Height, drawingContext.Blend);
+        }
+
+        private void DrawBottom(GlowDrawingContext drawingContext)
+        {
+            var orCreateBitmap = GetOrCreateBitmap(drawingContext, GlowBitmapPart.BottomLeft);
+            var orCreateBitmap2 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.Bottom);
+            var orCreateBitmap3 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.BottomRight);
+            var num2 = GlowDepth + orCreateBitmap.Width;
+            var num3 = drawingContext.Width - GlowDepth - orCreateBitmap3.Width;
+            var num4 = num3 - num2;
+            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap.Handle);
+            InteropMethods.AlphaBlend(drawingContext.WindowDC, GlowDepth, 0, orCreateBitmap.Width, orCreateBitmap.Height,
+                drawingContext.BackgroundDC, 0, 0, orCreateBitmap.Width, orCreateBitmap.Height,
+                drawingContext.Blend);
+            if (num4 > 0)
+            {
+                InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap2.Handle);
+                InteropMethods.AlphaBlend(drawingContext.WindowDC, num2, 0, num4, orCreateBitmap2.Height,
+                    drawingContext.BackgroundDC, 0, 0, orCreateBitmap2.Width, orCreateBitmap2.Height,
+                    drawingContext.Blend);
+            }
+
+            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap3.Handle);
+            InteropMethods.AlphaBlend(drawingContext.WindowDC, num3, 0, orCreateBitmap3.Width,
+                orCreateBitmap3.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap3.Width,
+                orCreateBitmap3.Height, drawingContext.Blend);
+        }
+
+        internal void UpdateWindowPos()
+        {
+            var targetWindowHandle = TargetWindowHandle;
+            InteropMethods.GetWindowRect(targetWindowHandle, out var rect);
+            InteropMethods.GetWindowPlacement(targetWindowHandle);
+            if (IsVisible)
+                switch (_orientation)
+                {
+                    case Dock.Left:
+                        Left = rect.Left - GlowDepth;
+                        Top = rect.Top - GlowDepth;
+                        Width = GlowDepth;
+                        Height = rect.Height + CornerGripThickness;
+                        return;
+                    case Dock.Top:
+                        Left = rect.Left - GlowDepth;
+                        Top = rect.Top - GlowDepth;
+                        Width = rect.Width + CornerGripThickness;
+                        Height = GlowDepth;
+                        return;
+                    case Dock.Right:
+                        Left = rect.Right;
+                        Top = rect.Top - GlowDepth;
+                        Width = GlowDepth;
+                        Height = rect.Height + CornerGripThickness;
+                        return;
+                    default:
+                        Left = rect.Left - GlowDepth;
+                        Top = rect.Bottom;
+                        Width = rect.Width + CornerGripThickness;
+                        Height = GlowDepth;
+                        break;
+                }
+        }
+
+        [Flags]
+        private enum FieldInvalidationTypes
+        {
+            None = 0,
+            Location = 1,
+            Size = 2,
+            ActiveColor = 4,
+            InactiveColor = 8,
+            Render = 16,
+            Visibility = 32
+        }
+    }
+}
diff --git a/src/Shared/HandyControl_Shared/Data/HwndWrapper.cs b/src/Shared/HandyControl_Shared/Data/HwndWrapper.cs
new file mode 100644
index 00000000..ff0f69d0
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Data/HwndWrapper.cs
@@ -0,0 +1,102 @@
+using System;
+using System.Runtime.InteropServices;
+using HandyControl.Tools.Interop;
+
+namespace HandyControl.Data
+{
+    public abstract class HwndWrapper : DisposableObject
+    {
+        private IntPtr _handle;
+        
+        private bool _isHandleCreationAllowed = true;
+        
+        private ushort _wndClassAtom;
+        
+        private Delegate _wndProc;
+
+        protected ushort WindowClassAtom
+        {
+            get
+            {
+                if (_wndClassAtom == 0) _wndClassAtom = CreateWindowClassCore();
+                return _wndClassAtom;
+            }
+        }
+
+        public IntPtr Handle
+        {
+            get
+            {
+                EnsureHandle();
+                return _handle;
+            }
+        }
+
+        protected virtual bool IsWindowSubclassed => false;
+
+        protected virtual ushort CreateWindowClassCore() => RegisterClass(Guid.NewGuid().ToString());
+
+        protected virtual void DestroyWindowClassCore()
+        {
+            if (_wndClassAtom != 0)
+            {
+                var moduleHandle = InteropMethods.GetModuleHandle(null);
+                InteropMethods.UnregisterClass(new IntPtr(_wndClassAtom), moduleHandle);
+                _wndClassAtom = 0;
+            }
+        }
+
+        protected ushort RegisterClass(string className)
+        {
+            var wndClass = default(InteropValues.WNDCLASS);
+            wndClass.cbClsExtra = 0;
+            wndClass.cbWndExtra = 0;
+            wndClass.hbrBackground = IntPtr.Zero;
+            wndClass.hCursor = IntPtr.Zero;
+            wndClass.hIcon = IntPtr.Zero;
+            wndClass.lpfnWndProc = _wndProc = new InteropValues.WndProc(WndProc);
+            wndClass.lpszClassName = className;
+            wndClass.lpszMenuName = null;
+            wndClass.style = 0u;
+            return InteropMethods.RegisterClass(ref wndClass);
+        }
+
+        private void SubclassWndProc()
+        {
+            _wndProc = new InteropValues.WndProc(WndProc);
+            InteropMethods.SetWindowLong(_handle, -4, Marshal.GetFunctionPointerForDelegate(_wndProc));
+        }
+
+        protected abstract IntPtr CreateWindowCore();
+
+        protected virtual void DestroyWindowCore()
+        {
+            if (_handle != IntPtr.Zero)
+            {
+                InteropMethods.DestroyWindow(_handle);
+                _handle = IntPtr.Zero;
+            }
+        }
+
+        protected virtual IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam) =>
+            InteropMethods.DefWindowProc(hwnd, msg, wParam, lParam);
+
+        public void EnsureHandle()
+        {
+            if (_handle == IntPtr.Zero)
+            {
+                if (!_isHandleCreationAllowed) return;
+                _isHandleCreationAllowed = false;
+                _handle = CreateWindowCore();
+                if (IsWindowSubclassed) SubclassWndProc();
+            }
+        }
+
+        protected override void DisposeNativeResources()
+        {
+            _isHandleCreationAllowed = false;
+            DestroyWindowCore();
+            DestroyWindowClassCore();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/ResourceToken.cs b/src/Shared/HandyControl_Shared/Data/ResourceToken.cs
index 0b2bfcae..3b9d94bf 100644
--- a/src/Shared/HandyControl_Shared/Data/ResourceToken.cs
+++ b/src/Shared/HandyControl_Shared/Data/ResourceToken.cs
@@ -302,6 +302,10 @@
 
         internal const string WindowWin10 = nameof(WindowWin10);
 
+        internal const string WindowBlur = nameof(WindowBlur);
+
+        internal const string WindowGlow = nameof(WindowGlow);
+
         internal const string AddTagButtonStyle = nameof(AddTagButtonStyle);
 
         internal const string RadioGroupItemDefault = nameof(RadioGroupItemDefault);
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index bf76311c..8f137a9f 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -42,6 +42,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Slider\RangeSlider\TwoWayRangeBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Block\RunningBlock.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Window\GlowWindow.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Data\DisposableObject.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\DrawerShowMode.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\HatchStyle.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\HitMode.cs" />
@@ -49,6 +50,12 @@
     <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\NotifyIconInfoType.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\StrokePosition.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\TransitionMode.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Data\GlowWindow\ChangeScope.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Data\GlowWindow\GlowBitmap.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Data\GlowWindow\GlowBitmapPart.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Data\GlowWindow\GlowDrawingContext.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Data\GlowWindow\GlowEdge.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Data\HwndWrapper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Commands\CloseWindowCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Commands\OpenLinkCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Media\Animation\DiscreteGeometryKeyFrame.cs" />
@@ -71,6 +78,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\Number2PercentageConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\RectangleCircularConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\ThicknessSplitConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\Extension\DependencyObjectExtension.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Extension\FrameworkElementExtension.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Extension\StringExtension.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Extension\ValueExtension.cs" />
@@ -300,6 +308,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\ExternDllHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\IconHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\ResourceHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\ScreenHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\SecurityHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\SingleOpenHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\TokenizerHelper.cs" />
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/DependencyObjectExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/DependencyObjectExtension.cs
new file mode 100644
index 00000000..779d25bf
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/DependencyObjectExtension.cs
@@ -0,0 +1,18 @@
+using System.Windows;
+using System.Windows.Media;
+
+namespace HandyControl.Tools.Extension
+{
+    public static class DependencyObjectExtension
+    {
+        public static DependencyObject GetVisualOrLogicalParent(this DependencyObject sourceElement)
+        {
+            return sourceElement switch
+            {
+                null => null,
+                Visual _ => (VisualTreeHelper.GetParent(sourceElement) ?? LogicalTreeHelper.GetParent(sourceElement)),
+                _ => LogicalTreeHelper.GetParent(sourceElement)
+            };
+        }
+    }
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/ConfigHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/ConfigHelper.cs
index 21357505..f15e82a5 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/ConfigHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/ConfigHelper.cs
@@ -52,6 +52,15 @@ namespace HandyControl.Tools
             SetLang(config.Lang);
         }
 
+        public void SetWindowDefaultStyle(object resourceKey = null)
+        {
+            var metadata = resourceKey == null
+                ? new FrameworkPropertyMetadata(Application.Current.FindResource(typeof(System.Windows.Window)))
+                : new FrameworkPropertyMetadata(Application.Current.FindResource(resourceKey));
+
+            FrameworkElement.StyleProperty.OverrideMetadata(typeof(System.Windows.Window), metadata);
+        }
+
         public event PropertyChangedEventHandler PropertyChanged;
 
 #if netle40
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/DpiHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/DpiHelper.cs
index 76134f6a..d7669756 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/DpiHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/DpiHelper.cs
@@ -1,14 +1,54 @@
 using System;
 using System.Windows;
 using System.Windows.Media;
+using HandyControl.Tools.Interop;
 
 namespace HandyControl.Tools
 {
-    internal class DpiHelper
+    internal static class DpiHelper
     {
-        [ThreadStatic]
+        private const double LogicalDpi = 96.0;
+
+        [ThreadStatic] 
         private static Matrix _transformToDip;
 
+        static DpiHelper()
+        {
+            var dC = InteropMethods.GetDC(IntPtr.Zero);
+            if (dC != IntPtr.Zero)
+            {
+                DeviceDpiX = InteropMethods.GetDeviceCaps(dC, 88);
+                DeviceDpiY = InteropMethods.GetDeviceCaps(dC, 90);
+                InteropMethods.ReleaseDC(IntPtr.Zero, dC);
+            }
+            else
+            {
+                DeviceDpiX = LogicalDpi;
+                DeviceDpiY = LogicalDpi;
+            }
+
+            var identity = Matrix.Identity;
+            var identity2 = Matrix.Identity;
+            identity.Scale(DeviceDpiX / LogicalDpi, DeviceDpiY / LogicalDpi);
+            identity2.Scale(LogicalDpi / DeviceDpiX, LogicalDpi / DeviceDpiY);
+            TransformFromDevice = new MatrixTransform(identity2);
+            TransformFromDevice.Freeze();
+            TransformToDevice = new MatrixTransform(identity);
+            TransformToDevice.Freeze();
+        }
+
+        public static MatrixTransform TransformFromDevice { get; }
+
+        public static MatrixTransform TransformToDevice { get; }
+
+        public static double DeviceDpiX { get; }
+
+        public static double DeviceDpiY { get; }
+
+        public static double LogicalToDeviceUnitsScalingFactorX => TransformToDevice.Matrix.M11;
+
+        public static double LogicalToDeviceUnitsScalingFactorY => TransformToDevice.Matrix.M22;
+
         public static Point DevicePixelsToLogical(Point devicePoint, double dpiScaleX, double dpiScaleY)
         {
             _transformToDip = Matrix.Identity;
@@ -18,9 +58,22 @@ namespace HandyControl.Tools
 
         public static Size DeviceSizeToLogical(Size deviceSize, double dpiScaleX, double dpiScaleY)
         {
-            Point pt = DevicePixelsToLogical(new Point(deviceSize.Width, deviceSize.Height), dpiScaleX, dpiScaleY);
-
+            var pt = DevicePixelsToLogical(new Point(deviceSize.Width, deviceSize.Height), dpiScaleX, dpiScaleY);
             return new Size(pt.X, pt.Y);
         }
+
+        public static Rect LogicalToDeviceUnits(this Rect logicalRect)
+        {
+            var result = logicalRect;
+            result.Transform(TransformToDevice.Matrix);
+            return result;
+        }
+
+        public static Rect DeviceToLogicalUnits(this Rect deviceRect)
+        {
+            var result = deviceRect;
+            result.Transform(TransformFromDevice.Matrix);
+            return result;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/IconHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/IconHelper.cs
index 37b68989..f5f1bfb4 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/IconHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/IconHelper.cs
@@ -81,7 +81,7 @@ namespace HandyControl.Tools
             {
                 var bi = new InteropValues.BITMAPINFO(width, -height, 32)
                 {
-                    bmiHeader_biCompression = InteropValues.BI_RGB
+                    biCompression = InteropValues.BI_RGB
                 };
 
                 var bits = IntPtr.Zero;
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/ScreenHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/ScreenHelper.cs
new file mode 100644
index 00000000..9bcfab2f
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/ScreenHelper.cs
@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Windows;
+using HandyControl.Tools.Interop;
+
+namespace HandyControl.Tools
+{
+    internal class ScreenHelper
+    {
+        internal static void FindMaximumSingleMonitorRectangle(Rect windowRect, out Rect screenSubRect, out Rect monitorRect)
+        {
+            var windowRect2 = new InteropValues.RECT(windowRect);
+            FindMaximumSingleMonitorRectangle(windowRect2, out var rect, out var rect2);
+            screenSubRect = new Rect(rect.Position, rect.Size);
+            monitorRect = new Rect(rect2.Position, rect2.Size);
+        }
+
+        private static void FindMaximumSingleMonitorRectangle(InteropValues.RECT windowRect, out InteropValues.RECT screenSubRect, out InteropValues.RECT monitorRect)
+        {
+            var rects = new List<InteropValues.RECT>();
+            InteropMethods.EnumDisplayMonitors(IntPtr.Zero, IntPtr.Zero,
+                delegate(IntPtr hMonitor, IntPtr hdcMonitor, ref InteropValues.RECT rect, IntPtr lpData)
+                {
+                    var monitorInfo = default(InteropValues.MONITORINFO);
+                    monitorInfo.cbSize = (uint) Marshal.SizeOf(typeof(InteropValues.MONITORINFO));
+                    InteropMethods.GetMonitorInfo(hMonitor, ref monitorInfo);
+                    rects.Add(monitorInfo.rcWork);
+                    return true;
+                }, IntPtr.Zero);
+            
+            var num = 0L;
+            
+            screenSubRect = new InteropValues.RECT
+            {
+                Left = 0,
+                Right = 0,
+                Top = 0,
+                Bottom = 0
+            };
+            
+            monitorRect = new InteropValues.RECT
+            {
+                Left = 0,
+                Right = 0,
+                Top = 0,
+                Bottom = 0
+            };
+            
+            foreach (var current in rects)
+            {
+                var rect = current;
+                InteropMethods.IntersectRect(out var rECT2, ref rect, ref windowRect);
+                var num2 = (long) (rECT2.Width * rECT2.Height);
+                if (num2 > num)
+                {
+                    screenSubRect = rECT2;
+                    monitorRect = current;
+                    num = num2;
+                }
+            }
+        }
+
+        internal static void FindMonitorRectsFromPoint(Point point, out Rect monitorRect, out Rect workAreaRect)
+        {
+            var intPtr = InteropMethods.MonitorFromPoint(new InteropValues.POINT
+            {
+                X = (int) point.X,
+                Y = (int) point.Y
+            }, 2);
+            
+            monitorRect = new Rect(0.0, 0.0, 0.0, 0.0);
+            workAreaRect = new Rect(0.0, 0.0, 0.0, 0.0);
+            
+            if (intPtr != IntPtr.Zero)
+            {
+                InteropValues.MONITORINFO monitorInfo = default;
+                monitorInfo.cbSize = (uint) Marshal.SizeOf(typeof(InteropValues.MONITORINFO));
+                InteropMethods.GetMonitorInfo(intPtr, ref monitorInfo);
+                monitorRect = new Rect(monitorInfo.rcMonitor.Position, monitorInfo.rcMonitor.Size);
+                workAreaRect = new Rect(monitorInfo.rcWork.Position, monitorInfo.rcWork.Size);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/VisualHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/VisualHelper.cs
index 489a0d49..b6351478 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/VisualHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/VisualHelper.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Interop;
 using System.Windows.Media;
+using HandyControl.Tools.Interop;
 
 namespace HandyControl.Tools
 {
@@ -11,10 +12,7 @@ namespace HandyControl.Tools
         internal static VisualStateGroup TryGetVisualStateGroup(DependencyObject d, string groupName)
         {
             var root = GetImplementationRoot(d);
-            if (root == null)
-            {
-                return null;
-            }
+            if (root == null) return null;
 
             return VisualStateManager
                 .GetVisualStateGroups(root)?
@@ -31,10 +29,7 @@ namespace HandyControl.Tools
 
         public static T GetChild<T>(DependencyObject d) where T : DependencyObject
         {
-            if (d is T t)
-            {
-                return t;
-            }
+            if (d is T t) return t;
 
             for (var i = 0; i < VisualTreeHelper.GetChildrenCount(d); i++)
             {
@@ -47,7 +42,34 @@ namespace HandyControl.Tools
             return default;
         }
 
-        public static IntPtr GetHandle(this Visual visual) =>
-            (PresentationSource.FromVisual(visual) as HwndSource)?.Handle ?? IntPtr.Zero;
+        public static IntPtr GetHandle(this Visual visual)
+        {
+            return (PresentationSource.FromVisual(visual) as HwndSource)?.Handle ?? IntPtr.Zero;
+        }
+
+        internal static void HitTestVisibleElements(Visual visual, HitTestResultCallback resultCallback,
+            HitTestParameters parameters)
+        {
+            VisualTreeHelper.HitTest(visual, ExcludeNonVisualElements, resultCallback, parameters);
+        }
+
+        private static HitTestFilterBehavior ExcludeNonVisualElements(DependencyObject potentialHitTestTarget)
+        {
+            if (!(potentialHitTestTarget is Visual)) return HitTestFilterBehavior.ContinueSkipSelfAndChildren;
+
+            if (!(potentialHitTestTarget is UIElement uIElement) || uIElement.IsVisible && uIElement.IsEnabled)
+                return HitTestFilterBehavior.Continue;
+
+            return HitTestFilterBehavior.ContinueSkipSelfAndChildren;
+        }
+
+        internal static bool ModifyStyle(IntPtr hWnd, int styleToRemove, int styleToAdd)
+        {
+            var windowLong = InteropMethods.GetWindowLong(hWnd, InteropValues.GWL.STYLE);
+            var num = (windowLong & ~styleToRemove) | styleToAdd;
+            if (num == windowLong) return false;
+            InteropMethods.SetWindowLong(hWnd, InteropValues.GWL.STYLE, num);
+            return true;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs b/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs
index 965ad3c5..361d0853 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs
@@ -10,83 +10,87 @@ namespace HandyControl.Tools.Interop
 {
     internal class InteropMethods
     {
+        private static int vsmNotifyOwnerActivate;
+
+        public static readonly IntPtr HRGN_NONE = new IntPtr(-1);
+
         [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
         [ResourceExposure(ResourceScope.None)]
-        public static extern int RegisterWindowMessage(string msg);
+        internal static extern int RegisterWindowMessage(string msg);
 
         [DllImport(InteropValues.ExternDll.User32, SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern int MapWindowPoints(IntPtr hWndFrom, IntPtr hWndTo, ref InteropValues.RECT lpPoints, uint cPoints);
+        internal static extern int MapWindowPoints(IntPtr hWndFrom, IntPtr hWndTo, ref InteropValues.RECT lpPoints, uint cPoints);
 
         [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern bool ReadProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, out InteropValues.TBBUTTON lpBuffer,
+        internal static extern bool ReadProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, out InteropValues.TBBUTTON lpBuffer,
             int dwSize, out int lpNumberOfBytesRead);
 
         [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true)]
-        public static extern bool ReadProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, out InteropValues.RECT lpBuffer,
+        internal static extern bool ReadProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, out InteropValues.RECT lpBuffer,
             int dwSize, out int lpNumberOfBytesRead);
 
         [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true)]
-        public static extern bool ReadProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, out InteropValues.TRAYDATA lpBuffer,
+        internal static extern bool ReadProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, out InteropValues.TRAYDATA lpBuffer,
             int dwSize, out int lpNumberOfBytesRead);
 
         [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
-        public static extern uint SendMessage(IntPtr hWnd, uint Msg, uint wParam, IntPtr lParam);
+        internal static extern uint SendMessage(IntPtr hWnd, uint Msg, uint wParam, IntPtr lParam);
 
         [DllImport(InteropValues.ExternDll.User32, SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
+        internal static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
 
         [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern IntPtr OpenProcess(InteropValues.ProcessAccess dwDesiredAccess,
+        internal static extern IntPtr OpenProcess(InteropValues.ProcessAccess dwDesiredAccess,
             [MarshalAs(UnmanagedType.Bool)] bool bInheritHandle, uint dwProcessId);
 
         [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern IntPtr VirtualAllocEx(IntPtr hProcess, IntPtr lpAddress, int dwSize,
+        internal static extern IntPtr VirtualAllocEx(IntPtr hProcess, IntPtr lpAddress, int dwSize,
             InteropValues.AllocationType flAllocationType, InteropValues.MemoryProtection flProtect);
 
         [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern int CloseHandle(IntPtr hObject);
+        internal static extern int CloseHandle(IntPtr hObject);
 
         [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern bool VirtualFreeEx(IntPtr hProcess, IntPtr lpAddress, int dwSize, InteropValues.FreeType dwFreeType);
+        internal static extern bool VirtualFreeEx(IntPtr hProcess, IntPtr lpAddress, int dwSize, InteropValues.FreeType dwFreeType);
 
         [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
-        public static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+        internal static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
 
         [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
-        public static extern IntPtr FindWindowEx(IntPtr hwndParent, IntPtr hwndChildAfter, string lpszClass,
+        internal static extern IntPtr FindWindowEx(IntPtr hwndParent, IntPtr hwndChildAfter, string lpszClass,
             string lpszWindow);
 
         [DllImport(InteropValues.ExternDll.User32)]
-        public static extern int GetWindowRect(IntPtr hwnd, out InteropValues.RECT lpRect);
+        internal static extern int GetWindowRect(IntPtr hwnd, out InteropValues.RECT lpRect);
 
         [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
-        public static extern bool GetCursorPos(out InteropValues.POINT pt);
+        internal static extern bool GetCursorPos(out InteropValues.POINT pt);
 
         [DllImport(InteropValues.ExternDll.User32)]
-        public static extern IntPtr GetDesktopWindow();
+        internal static extern IntPtr GetDesktopWindow();
 
         [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
         [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool AddClipboardFormatListener(IntPtr hwnd);
+        internal static extern bool AddClipboardFormatListener(IntPtr hwnd);
 
         [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
         [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool RemoveClipboardFormatListener(IntPtr hwnd);
+        internal static extern bool RemoveClipboardFormatListener(IntPtr hwnd);
 
         [DllImport(InteropValues.ExternDll.User32)]
-        public static extern IntPtr GetSystemMenu(IntPtr hWnd, bool bRevert);
+        internal static extern IntPtr GetSystemMenu(IntPtr hWnd, bool bRevert);
 
         [DllImport(InteropValues.ExternDll.User32)]
-        public static extern bool InsertMenu(IntPtr hMenu, int wPosition, int wFlags, int wIDNewItem, string lpNewItem);
+        internal static extern bool InsertMenu(IntPtr hMenu, int wPosition, int wFlags, int wIDNewItem, string lpNewItem);
 
         [SecurityCritical]
         [SuppressUnmanagedCodeSecurity]
         [DllImport(InteropValues.ExternDll.User32, SetLastError = true, ExactSpelling = true, EntryPoint = nameof(GetDC),
             CharSet = CharSet.Auto)]
-        public static extern IntPtr IntGetDC(HandleRef hWnd);
+        internal static extern IntPtr IntGetDC(HandleRef hWnd);
 
         [SecurityCritical]
-        public static IntPtr GetDC(HandleRef hWnd)
+        internal static IntPtr GetDC(HandleRef hWnd)
         {
             var hDc = IntGetDC(hWnd);
             if (hDc == IntPtr.Zero) throw new Win32Exception();
@@ -97,10 +101,10 @@ namespace HandyControl.Tools.Interop
         [SecurityCritical]
         [SuppressUnmanagedCodeSecurity]
         [DllImport(InteropValues.ExternDll.User32, ExactSpelling = true, EntryPoint = nameof(ReleaseDC), CharSet = CharSet.Auto)]
-        public static extern int IntReleaseDC(HandleRef hWnd, HandleRef hDC);
+        internal static extern int IntReleaseDC(HandleRef hWnd, HandleRef hDC);
 
         [SecurityCritical]
-        public static int ReleaseDC(HandleRef hWnd, HandleRef hDC)
+        internal static int ReleaseDC(HandleRef hWnd, HandleRef hDC)
         {
             HandleCollector.Remove((IntPtr) hDC, CommonHandles.HDC);
             return IntReleaseDC(hWnd, hDC);
@@ -109,12 +113,12 @@ namespace HandyControl.Tools.Interop
         [SecurityCritical]
         [SuppressUnmanagedCodeSecurity]
         [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto)]
-        public static extern int GetDeviceCaps(HandleRef hDC, int nIndex);
+        internal static extern int GetDeviceCaps(HandleRef hDC, int nIndex);
 
         [SecurityCritical]
         [SuppressUnmanagedCodeSecurity]
         [DllImport(InteropValues.ExternDll.User32)]
-        public static extern int GetSystemMetrics(InteropValues.SM nIndex);
+        internal static extern int GetSystemMetrics(InteropValues.SM nIndex);
 
         [SecurityCritical]
         [SuppressUnmanagedCodeSecurity]
@@ -122,7 +126,7 @@ namespace HandyControl.Tools.Interop
         private static extern bool IntDestroyIcon(IntPtr hIcon);
 
         [SecurityCritical]
-        public static bool DestroyIcon(IntPtr hIcon)
+        internal static bool DestroyIcon(IntPtr hIcon)
         {
             var result = IntDestroyIcon(hIcon);
             return result;
@@ -134,14 +138,14 @@ namespace HandyControl.Tools.Interop
         private static extern bool IntDeleteObject(IntPtr hObject);
 
         [SecurityCritical]
-        public static bool DeleteObject(IntPtr hObject)
+        internal static bool DeleteObject(IntPtr hObject)
         {
             var result = IntDeleteObject(hObject);
             return result;
         }
 
         [SecurityCritical]
-        public static BitmapHandle CreateDIBSection(HandleRef hdc, ref InteropValues.BITMAPINFO bitmapInfo, int iUsage,
+        internal static BitmapHandle CreateDIBSection(HandleRef hdc, ref InteropValues.BITMAPINFO bitmapInfo, int iUsage,
             ref IntPtr ppvBits, SafeFileMappingHandle hSection, int dwOffset)
         {
             if (hSection == null) hSection = new SafeFileMappingHandle(IntPtr.Zero);
@@ -151,7 +155,7 @@ namespace HandyControl.Tools.Interop
         }
 
         [DllImport(InteropValues.ExternDll.Kernel32, EntryPoint = "CloseHandle", CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern bool IntCloseHandle(HandleRef handle);
+        internal static extern bool IntCloseHandle(HandleRef handle);
 
         [SecurityCritical]
         [SuppressUnmanagedCodeSecurity]
@@ -168,7 +172,7 @@ namespace HandyControl.Tools.Interop
             InteropValues.ICONINFO iconInfo);
 
         [SecurityCritical]
-        public static IconHandle CreateIconIndirect([In] [MarshalAs(UnmanagedType.LPStruct)]
+        internal static IconHandle CreateIconIndirect([In] [MarshalAs(UnmanagedType.LPStruct)]
             InteropValues.ICONINFO iconInfo)
         {
             var hIcon = PrivateCreateIconIndirect(iconInfo);
@@ -221,12 +225,12 @@ namespace HandyControl.Tools.Interop
             out IconHandle phiconSmall, int nIcons);
 
         [DllImport(InteropValues.ExternDll.Shell32, CharSet = CharSet.Auto)]
-        public static extern int Shell_NotifyIcon(int message, InteropValues.NOTIFYICONDATA pnid);
+        internal static extern int Shell_NotifyIcon(int message, InteropValues.NOTIFYICONDATA pnid);
 
         [SecurityCritical]
         [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         [DllImport(InteropValues.ExternDll.User32, SetLastError = true, CharSet = CharSet.Unicode, EntryPoint = "CreateWindowExW")]
-        public static extern IntPtr CreateWindowEx(
+        internal static extern IntPtr CreateWindowEx(
             int dwExStyle,
             [MarshalAs(UnmanagedType.LPWStr)] string lpClassName,
             [MarshalAs(UnmanagedType.LPWStr)] string lpWindowName,
@@ -243,39 +247,273 @@ namespace HandyControl.Tools.Interop
         [SecurityCritical]
         [SuppressUnmanagedCodeSecurity]
         [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Unicode, SetLastError = true, BestFitMapping = false)]
-        public static extern short RegisterClass(InteropValues.WNDCLASS wc);
+        internal static extern short RegisterClass(InteropValues.WNDCLASS wc);
 
         [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
-        public static extern IntPtr DefWindowProc(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
+        internal static extern IntPtr DefWindowProc(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
 
         [DllImport(InteropValues.ExternDll.User32, ExactSpelling = true, CharSet = CharSet.Auto)]
-        public static extern bool SetForegroundWindow(IntPtr hWnd);
+        internal static extern bool SetForegroundWindow(IntPtr hWnd);
 
         [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern IntPtr CallNextHookEx(IntPtr hhk, int nCode, IntPtr wParam, IntPtr lParam);
+        internal static extern IntPtr CallNextHookEx(IntPtr hhk, int nCode, IntPtr wParam, IntPtr lParam);
 
         [DllImport(InteropValues.ExternDll.Kernel32, CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern IntPtr GetModuleHandle(string lpModuleName);
+        internal static extern IntPtr GetModuleHandle(string lpModuleName);
 
         [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern bool UnhookWindowsHookEx(IntPtr hhk);
+        internal static extern bool UnhookWindowsHookEx(IntPtr hhk);
 
         [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern IntPtr SetWindowsHookEx(int idHook, InteropValues.HookProc lpfn, IntPtr hMod, uint dwThreadId);
+        internal static extern IntPtr SetWindowsHookEx(int idHook, InteropValues.HookProc lpfn, IntPtr hMod, uint dwThreadId);
 
         [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
-        public static extern IntPtr GetWindowDC(IntPtr window);
+        internal static extern IntPtr GetWindowDC(IntPtr window);
 
         [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true)]
-        public static extern uint GetPixel(IntPtr dc, int x, int y);
+        internal static extern uint GetPixel(IntPtr dc, int x, int y);
 
         [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
-        public static extern int ReleaseDC(IntPtr window, IntPtr dc);
+        internal static extern int ReleaseDC(IntPtr window, IntPtr dc);
 
         [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto)]
-        public static extern int GetDeviceCaps(IntPtr hdc, int nIndex);
+        internal static extern int GetDeviceCaps(IntPtr hdc, int nIndex);
 
         [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
-        public static extern IntPtr GetDC(IntPtr ptr);
+        internal static extern IntPtr GetDC(IntPtr ptr);
+
+        internal static int NOTIFYOWNERACTIVATE
+        {
+            get
+            {
+                if (vsmNotifyOwnerActivate == 0)
+                {
+                    vsmNotifyOwnerActivate = RegisterWindowMessage("NOTIFYOWNERACTIVATE{A982313C-756C-4da9-8BD0-0C375A45784B}");
+                }
+                return vsmNotifyOwnerActivate;
+            }
+        }
+
+        [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool GetWindowPlacement(IntPtr hwnd, InteropValues.WINDOWPLACEMENT lpwndpl);
+        
+        internal static InteropValues.WINDOWPLACEMENT GetWindowPlacement(IntPtr hwnd)
+        {
+            InteropValues.WINDOWPLACEMENT wINDOWPLACEMENT = new InteropValues.WINDOWPLACEMENT();
+            if (GetWindowPlacement(hwnd, wINDOWPLACEMENT))
+            {
+                return wINDOWPLACEMENT;
+            }
+            throw new Win32Exception(Marshal.GetLastWin32Error());
+        }
+        
+        [DllImport(InteropValues.ExternDll.User32)]
+        internal static extern int GetSystemMetrics(int index);
+        
+        [DllImport(InteropValues.ExternDll.User32)]
+        internal static extern int TrackPopupMenuEx(IntPtr hmenu, uint fuFlags, int x, int y, IntPtr hwnd, IntPtr lptpm);
+        
+        [DllImport(InteropValues.ExternDll.User32)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool EnableMenuItem(IntPtr menu, uint uIDEnableItem, uint uEnable);
+        
+        [DllImport(InteropValues.ExternDll.User32)]
+        internal static extern short GetKeyState(int vKey);
+        
+        internal static bool IsKeyPressed(int vKey) => GetKeyState(vKey) < 0;
+
+        internal static IntPtr MakeParam(int lowWord, int highWord) => new IntPtr((lowWord & 65535) | highWord << 16);
+
+        internal static int GetXLParam(int lParam) => LoWord(lParam);
+
+        internal static int GetYLParam(int lParam) => HiWord(lParam);
+
+        internal static int HiWord(int value) => (short)(value >> 16);
+
+        internal static int LoWord(int value) => (short)(value & 65535);
+
+        [DllImport(InteropValues.ExternDll.User32)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool ScreenToClient(IntPtr hWnd, ref InteropValues.POINT point);
+        
+        [DllImport(InteropValues.ExternDll.User32)]
+        internal static extern IntPtr MonitorFromWindow(IntPtr handle, int flags);
+        
+        [DllImport(InteropValues.ExternDll.User32)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool ClientToScreen(IntPtr hWnd, ref InteropValues.POINT point);
+        
+        [DllImport(InteropValues.ExternDll.User32)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool EnumThreadWindows(uint dwThreadId, InteropValues.EnumWindowsProc lpfn, IntPtr lParam);
+        
+        [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool PostMessage(IntPtr hWnd, int nMsg, IntPtr wParam, IntPtr lParam);
+
+        [DllImport(InteropValues.ExternDll.User32)]
+        internal static extern IntPtr GetDCEx(IntPtr hWnd, IntPtr hrgnClip, int dwFlags);
+        
+        [DllImport(InteropValues.ExternDll.Gdi32)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool DeleteDC(IntPtr hdc);
+        
+        [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true)]
+        internal static extern IntPtr CreateCompatibleDC(IntPtr hdc);
+
+        [DllImport(InteropValues.ExternDll.Gdi32, ExactSpelling = true, SetLastError = true)]
+        internal static extern IntPtr SelectObject(IntPtr hdc, IntPtr hgdiobj);
+        
+        [DllImport(InteropValues.ExternDll.Gdi32, CallingConvention = CallingConvention.StdCall, ExactSpelling = true)]
+        internal static extern IntPtr CreateRoundRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, int nWidthEllipse, int nHeightEllipse);
+        
+        [DllImport(InteropValues.ExternDll.Gdi32, CallingConvention = CallingConvention.StdCall, ExactSpelling = true)]
+        internal static extern IntPtr CreateRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
+        
+        [DllImport(InteropValues.ExternDll.Gdi32, CallingConvention = CallingConvention.StdCall, ExactSpelling = true)]
+        internal static extern IntPtr CreateRectRgnIndirect(ref InteropValues.RECT lprc);
+        
+        [DllImport(InteropValues.ExternDll.Gdi32, CallingConvention = CallingConvention.StdCall, ExactSpelling = true)]
+        private static extern int CombineRgn(IntPtr hrngDest, IntPtr hrgnSrc1, IntPtr hrgnSrc2, int fnCombineMode);
+
+        internal static int CombineRgn(IntPtr hrnDest, IntPtr hrgnSrc1, IntPtr hrgnSrc2,
+            InteropValues.CombineMode combineMode) => CombineRgn(hrnDest, hrgnSrc1, hrgnSrc2, (int) combineMode);
+
+        [DllImport(InteropValues.ExternDll.User32, CallingConvention = CallingConvention.StdCall, ExactSpelling = true)]
+        internal static extern int SetWindowRgn(IntPtr hWnd, IntPtr hRgn, [MarshalAs(UnmanagedType.Bool)] bool redraw);
+
+        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static extern IntPtr SendMessage(IntPtr hWnd, int nMsg, IntPtr wParam, IntPtr lParam);
+
+        [DllImport(InteropValues.ExternDll.User32)]
+        internal static extern IntPtr MonitorFromPoint(InteropValues.POINT pt, int flags);
+        
+        [DllImport(InteropValues.ExternDll.User32)]
+        internal static extern IntPtr GetWindow(IntPtr hwnd, int nCmd);
+        
+        [DllImport(InteropValues.ExternDll.User32)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool GetWindowInfo(IntPtr hwnd, ref InteropValues.WINDOWINFO pwi);
+
+        [DllImport(InteropValues.ExternDll.User32)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool IsWindowVisible(IntPtr hwnd);
+        
+        [DllImport(InteropValues.ExternDll.User32)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool IsIconic(IntPtr hwnd);
+        
+        [DllImport(InteropValues.ExternDll.User32)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool IsZoomed(IntPtr hwnd);
+        
+        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto, ExactSpelling = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int cx, int cy, int flags);
+        
+        internal static System.Windows.Point GetCursorPos()
+        {
+            var result = default(System.Windows.Point);
+            if (GetCursorPos(out var point))
+            {
+                result.X = point.X;
+                result.Y = point.Y;
+            }
+            return result;
+        }
+
+        [DllImport(InteropValues.ExternDll.User32)]
+        private static extern int GetWindowLong(IntPtr hWnd, int nIndex);
+
+        internal static int GetWindowLong(IntPtr hWnd, InteropValues.GWL nIndex) => GetWindowLong(hWnd, (int)nIndex);
+        
+        [DllImport(InteropValues.ExternDll.User32)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool GetClientRect(IntPtr hwnd, out InteropValues.RECT lpRect);
+
+        internal static IntPtr SetWindowLong(IntPtr hWnd, int nIndex, IntPtr dwNewLong)
+        {
+            if (IntPtr.Size == 4)
+            {
+                return SetWindowLongPtr32(hWnd, nIndex, dwNewLong);
+            }
+            return SetWindowLongPtr64(hWnd, nIndex, dwNewLong);
+        }
+        
+        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto, EntryPoint = "SetWindowLong")]
+        internal static extern IntPtr SetWindowLongPtr32(IntPtr hWnd, int nIndex, IntPtr dwNewLong);
+        
+        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto, EntryPoint = "SetWindowLongPtr")]
+        internal static extern IntPtr SetWindowLongPtr64(IntPtr hWnd, int nIndex, IntPtr dwNewLong);
+
+        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Unicode)]
+        private static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
+        
+        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Unicode)]
+        private static extern IntPtr SetWindowLongPtr(IntPtr hWnd, int nIndex, IntPtr dwNewLong);
+        
+        internal static IntPtr SetWindowLongPtr(IntPtr hWnd, InteropValues.GWLP nIndex, IntPtr dwNewLong)
+        {
+            if (IntPtr.Size == 8)
+            {
+                return SetWindowLongPtr(hWnd, (int)nIndex, dwNewLong);
+            }
+            return new IntPtr(SetWindowLong(hWnd, (int)nIndex, dwNewLong.ToInt32()));
+        }
+        
+        internal static int SetWindowLong(IntPtr hWnd, InteropValues.GWL nIndex, int dwNewLong) => SetWindowLong(hWnd, (int)nIndex, dwNewLong);
+
+        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Unicode)]
+        internal static extern ushort RegisterClass(ref InteropValues.WNDCLASS lpWndClass);
+
+        [DllImport(InteropValues.ExternDll.Kernel32)]
+        internal static extern uint GetCurrentThreadId();
+
+        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static extern IntPtr CreateWindowEx(int dwExStyle, IntPtr classAtom, string lpWindowName, int dwStyle, int x, int y, int nWidth, int nHeight, IntPtr hWndParent, IntPtr hMenu, IntPtr hInstance, IntPtr lpParam);
+
+        [DllImport(InteropValues.ExternDll.Gdi32)]
+        internal static extern IntPtr CreateSolidBrush(int colorref);
+
+        [DllImport(InteropValues.ExternDll.User32)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool DestroyWindow(IntPtr hwnd);
+        
+        [DllImport(InteropValues.ExternDll.User32)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool UnregisterClass(IntPtr classAtom, IntPtr hInstance);
+        
+        [DllImport(InteropValues.ExternDll.User32)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool UpdateLayeredWindow(IntPtr hwnd, IntPtr hdcDest, ref InteropValues.POINT pptDest, ref InteropValues.SIZE psize, IntPtr hdcSrc, ref InteropValues.POINT pptSrc, uint crKey, [In] ref InteropValues.BLENDFUNCTION pblend, uint dwFlags);
+        
+        [DllImport(InteropValues.ExternDll.User32)]
+        internal static extern bool RedrawWindow(IntPtr hWnd, IntPtr lprcUpdate, IntPtr hrgnUpdate, InteropValues.RedrawWindowFlags flags);
+        
+        [DllImport(InteropValues.ExternDll.User32)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool FillRect(IntPtr hDC, ref InteropValues.RECT rect, IntPtr hbrush);
+        
+        [DllImport(InteropValues.ExternDll.User32)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool EnumDisplayMonitors(IntPtr hdc, IntPtr lprcClip, InteropValues.EnumMonitorsDelegate lpfnEnum, IntPtr dwData);
+        
+        [DllImport(InteropValues.ExternDll.User32)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool IntersectRect(out InteropValues.RECT lprcDst, [In] ref InteropValues.RECT lprcSrc1, [In] ref InteropValues.RECT lprcSrc2);
+        
+        [DllImport(InteropValues.ExternDll.User32)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool GetMonitorInfo(IntPtr hMonitor, ref InteropValues.MONITORINFO monitorInfo);
+        
+        [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true)]
+        internal static extern IntPtr CreateDIBSection(IntPtr hdc, ref InteropValues.BITMAPINFO pbmi, uint iUsage, out IntPtr ppvBits, IntPtr hSection, uint dwOffset);
+        
+        [DllImport(InteropValues.ExternDll.MsImg)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool AlphaBlend(IntPtr hdcDest, int xoriginDest, int yoriginDest, int wDest, int hDest, IntPtr hdcSrc, int xoriginSrc, int yoriginSrc, int wSrc, int hSrc, InteropValues.BLENDFUNCTION pfn);
+        
+        internal static int GET_SC_WPARAM(IntPtr wParam) => (int)wParam & 65520;
     }
 }
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs b/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
index dc2c7cd0..0a605703 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
@@ -1,18 +1,36 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Security;
+using System.Windows;
 
 namespace HandyControl.Tools.Interop
 {
-    public class InteropValues
+    internal class InteropValues
     {
-        #region public
+        internal static class ExternDll
+        {
+            public const string
+                User32 = "user32.dll",
+                Gdi32 = "gdi32.dll",
+                Kernel32 = "kernel32.dll",
+                Shell32 = "shell32.dll",
+                MsImg = "msimg32.dll";
+        }
 
-        public delegate IntPtr HookProc(int code, IntPtr wParam, IntPtr lParam);
+        internal delegate IntPtr HookProc(int code, IntPtr wParam, IntPtr lParam);
 
-        public delegate IntPtr WndProc(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
+        internal delegate IntPtr WndProc(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
 
-        public const int
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal delegate bool EnumMonitorsDelegate(IntPtr hMonitor, IntPtr hdcMonitor, ref RECT lprcMonitor, IntPtr dwData);
+
+        internal delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
+
+        internal delegate IntPtr SubclassProc(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam, UIntPtr id, IntPtr refData);
+
+        internal delegate IntPtr WindowsHookProc(CbtHookAction code, IntPtr wParam, IntPtr lParam);
+
+        internal const int
             WS_CHILD = 0x40000000,
             BITSPIXEL = 12,
             PLANES = 14,
@@ -73,7 +91,7 @@ namespace HandyControl.Tools.Interop
             SW_HIDE = 0;
 
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-        public class NOTIFYICONDATA
+        internal class NOTIFYICONDATA
         {
             public int cbSize = Marshal.SizeOf(typeof(NOTIFYICONDATA));
             public IntPtr hWnd;
@@ -93,40 +111,8 @@ namespace HandyControl.Tools.Interop
             public int dwInfoFlags;
         }
 
-        [Flags]
-        public enum ProcessAccess
-        {
-            AllAccess = CreateThread | DuplicateHandle | QueryInformation | SetInformation | Terminate | VMOperation | VMRead | VMWrite | Synchronize,
-            CreateThread = 0x2,
-            DuplicateHandle = 0x40,
-            QueryInformation = 0x400,
-            SetInformation = 0x200,
-            Terminate = 0x1,
-            VMOperation = 0x8,
-            VMRead = 0x10,
-            VMWrite = 0x20,
-            Synchronize = 0x100000
-        }
-
-        [Serializable, StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-        public struct RECT
-        {
-            public int Left;
-            public int Top;
-            public int Right;
-            public int Bottom;
-
-            public RECT(int left, int top, int right, int bottom)
-            {
-                Left = left;
-                Top = top;
-                Right = right;
-                Bottom = bottom;
-            }
-        }
-
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        public struct TBBUTTON
+        internal struct TBBUTTON
         {
             public int iBitmap;
             public int idCommand;
@@ -136,7 +122,7 @@ namespace HandyControl.Tools.Interop
         }
 
         [Flags]
-        public enum AllocationType
+        internal enum AllocationType
         {
             Commit = 0x1000,
             Reserve = 0x2000,
@@ -150,7 +136,7 @@ namespace HandyControl.Tools.Interop
         }
 
         [Flags]
-        public enum MemoryProtection
+        internal enum MemoryProtection
         {
             Execute = 0x10,
             ExecuteRead = 0x20,
@@ -166,7 +152,7 @@ namespace HandyControl.Tools.Interop
         }
 
         [StructLayout(LayoutKind.Sequential)]
-        public struct TRAYDATA
+        internal struct TRAYDATA
         {
             public IntPtr hwnd;
             public uint uID;
@@ -177,14 +163,14 @@ namespace HandyControl.Tools.Interop
         }
 
         [Flags]
-        public enum FreeType
+        internal enum FreeType
         {
             Decommit = 0x4000,
             Release = 0x8000,
         }
 
         [StructLayout(LayoutKind.Sequential)]
-        public struct POINT
+        internal struct POINT
         {
             public int X;
             public int Y;
@@ -196,14 +182,14 @@ namespace HandyControl.Tools.Interop
             }
         }
 
-        public enum HookType
+        internal enum HookType
         {
             WH_KEYBOARD_LL = 13,
             WH_MOUSE_LL = 14
         }
 
         [StructLayout(LayoutKind.Sequential)]
-        public struct MOUSEHOOKSTRUCT
+        internal struct MOUSEHOOKSTRUCT
         {
             public POINT pt;
             public IntPtr hwnd;
@@ -211,17 +197,227 @@ namespace HandyControl.Tools.Interop
             public IntPtr dwExtraInfo;
         }
 
-        #endregion
-
-        #region internal
-
-        internal static class ExternDll
+        [Flags]
+        internal enum ProcessAccess
         {
-            public const string
-                User32 = "user32.dll",
-                Gdi32 = "gdi32.dll",
-                Kernel32 = "kernel32.dll",
-                Shell32 = "shell32.dll";
+            AllAccess = CreateThread | DuplicateHandle | QueryInformation | SetInformation | Terminate | VMOperation | VMRead | VMWrite | Synchronize,
+            CreateThread = 0x2,
+            DuplicateHandle = 0x40,
+            QueryInformation = 0x400,
+            SetInformation = 0x200,
+            Terminate = 0x1,
+            VMOperation = 0x8,
+            VMRead = 0x10,
+            VMWrite = 0x20,
+            Synchronize = 0x100000
+        }
+
+        [Serializable, StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+        internal struct RECT
+        {
+            public int Left;
+            public int Top;
+            public int Right;
+            public int Bottom;
+
+            public RECT(int left, int top, int right, int bottom)
+            {
+                Left = left;
+                Top = top;
+                Right = right;
+                Bottom = bottom;
+            }
+
+            public RECT(Rect rect)
+            {
+                Left = (int)rect.Left;
+                Top = (int)rect.Top;
+                Right = (int)rect.Right;
+                Bottom = (int)rect.Bottom;
+            }
+
+            public Point Position => new Point(Left, Top);
+            public Size Size => new Size(Width, Height);
+
+            public int Height
+            {
+                get => Bottom - Top;
+                set => Bottom = Top + value;
+            }
+
+            public int Width
+            {
+                get => Right - Left;
+                set => Right = Left + value;
+            }
+
+            public void Offset(int dx, int dy)
+            {
+                Left += dx;
+                Right += dx;
+                Top += dy;
+                Bottom += dy;
+            }
+
+            public Int32Rect ToInt32Rect() => new Int32Rect(Left, Top, Width, Height);
+        }
+
+        internal struct BLENDFUNCTION
+        {
+            public byte BlendOp;
+            public byte BlendFlags;
+            public byte SourceConstantAlpha;
+            public byte AlphaFormat;
+        }
+        internal enum GWL
+        {
+            STYLE = -16,
+            EXSTYLE = -20
+        }
+        internal enum GWLP
+        {
+            WNDPROC = -4,
+            HINSTANCE = -6,
+            HWNDPARENT = -8,
+            USERDATA = -21,
+            ID = -12
+        }
+        internal enum CombineMode
+        {
+            RGN_AND = 1,
+            RGN_OR,
+            RGN_XOR,
+            RGN_DIFF,
+            RGN_COPY,
+            RGN_MIN = 1,
+            RGN_MAX = 5
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal class BITMAPFILEHEADER
+        {
+            public ushort bfType;
+            public uint bfSize;
+            public ushort bfReserved1;
+            public ushort bfReserved2;
+            public uint bfOffBits;
+        }
+
+        internal struct BITMAPINFOHEADER
+        {
+            internal uint biSize;
+            internal int biWidth;
+            internal int biHeight;
+            internal ushort biPlanes;
+            internal ushort biBitCount;
+            internal uint biCompression;
+            internal uint biSizeImage;
+            internal int biXPelsPerMeter;
+            internal int biYPelsPerMeter;
+            internal uint biClrUsed;
+            internal uint biClrImportant;
+        }
+
+        internal struct PictDescBitmap
+        {
+            internal int cbSizeOfStruct;
+            internal int pictureType;
+            internal IntPtr hBitmap;
+            internal IntPtr hPalette;
+            internal int unused;
+            internal static PictDescBitmap Default =>
+                new PictDescBitmap
+                {
+                    cbSizeOfStruct = 20,
+                    pictureType = 1,
+                    hBitmap = IntPtr.Zero,
+                    hPalette = IntPtr.Zero
+                };
+        }
+
+        [Flags]
+        internal enum RedrawWindowFlags : uint
+        {
+            Invalidate = 1u,
+            InternalPaint = 2u,
+            Erase = 4u,
+            Validate = 8u,
+            NoInternalPaint = 16u,
+            NoErase = 32u,
+            NoChildren = 64u,
+            AllChildren = 128u,
+            UpdateNow = 256u,
+            EraseNow = 512u,
+            Frame = 1024u,
+            NoFrame = 2048u
+        }
+
+        internal enum CbtHookAction
+        {
+            HCBT_MOVESIZE,
+            HCBT_MINMAX,
+            HCBT_QS,
+            HCBT_CREATEWND,
+            HCBT_DESTROYWND,
+            HCBT_ACTIVATE,
+            HCBT_CLICKSKIPPED,
+            HCBT_KEYSKIPPED,
+            HCBT_SYSCOMMAND,
+            HCBT_SETFOCUS
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal class WINDOWPOS
+        {
+            public IntPtr hwnd;
+            public IntPtr hwndInsertAfter;
+            public int x;
+            public int y;
+            public int cx;
+            public int cy;
+            public uint flags;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal class WINDOWPLACEMENT
+        {
+            public int length = Marshal.SizeOf(typeof(WINDOWPLACEMENT));
+            public int flags;
+            public int showCmd;
+            public POINT ptMinPosition;
+            public POINT ptMaxPosition;
+            public RECT rcNormalPosition;
+        }
+
+        internal struct WINDOWINFO
+        {
+            public int cbSize;
+            public RECT rcWindow;
+            public RECT rcClient;
+            public int dwStyle;
+            public int dwExStyle;
+            public uint dwWindowStatus;
+            public uint cxWindowBorders;
+            public uint cyWindowBorders;
+            public ushort atomWindowType;
+            public ushort wCreatorVersion;
+        }
+
+        [StructLayout(LayoutKind.Sequential, Pack = 4)]
+        internal struct SIZE
+        {
+            [ComAliasName("Microsoft.VisualStudio.OLE.Interop.LONG")]
+            public int cx;
+            [ComAliasName("Microsoft.VisualStudio.OLE.Interop.LONG")]
+            public int cy;
+        }
+
+        internal struct MONITORINFO
+        {
+            public uint cbSize;
+            public RECT rcMonitor;
+            public RECT rcWork;
+            public uint dwFlags;
         }
 
         internal enum SM
@@ -455,59 +651,61 @@ namespace HandyControl.Tools.Interop
             internal const int FALSE = 0;
         }
 
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-        internal class WNDCLASS
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        internal struct WNDCLASS
         {
-            public int style;
-            public WndProc lpfnWndProc;
+            public uint style;
+            public Delegate lpfnWndProc;
             public int cbClsExtra;
             public int cbWndExtra;
             public IntPtr hInstance;
             public IntPtr hIcon;
             public IntPtr hCursor;
             public IntPtr hbrBackground;
+            [MarshalAs(UnmanagedType.LPWStr)]
             public string lpszMenuName;
+            [MarshalAs(UnmanagedType.LPWStr)]
             public string lpszClassName;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 2)]
         internal struct BITMAPINFO
         {
-            public int bmiHeader_biSize;
+            public int biSize;
 
-            public int bmiHeader_biWidth;
+            public int biWidth;
 
-            public int bmiHeader_biHeight;
+            public int biHeight;
 
-            public short bmiHeader_biPlanes;
+            public short biPlanes;
 
-            public short bmiHeader_biBitCount;
+            public short biBitCount;
 
-            public int bmiHeader_biCompression;
+            public int biCompression;
 
-            public int bmiHeader_biSizeImage;
+            public int biSizeImage;
 
-            public int bmiHeader_biXPelsPerMeter;
+            public int biXPelsPerMeter;
 
-            public int bmiHeader_biYPelsPerMeter;
+            public int biYPelsPerMeter;
 
-            public int bmiHeader_biClrUsed;
+            public int biClrUsed;
 
-            public int bmiHeader_biClrImportant;
+            public int biClrImportant;
 
             public BITMAPINFO(int width, int height, short bpp)
             {
-                bmiHeader_biSize = SizeOf();
-                bmiHeader_biWidth = width;
-                bmiHeader_biHeight = height;
-                bmiHeader_biPlanes = 1;
-                bmiHeader_biBitCount = bpp;
-                bmiHeader_biCompression = 0;
-                bmiHeader_biSizeImage = 0;
-                bmiHeader_biXPelsPerMeter = 0;
-                bmiHeader_biYPelsPerMeter = 0;
-                bmiHeader_biClrUsed = 0;
-                bmiHeader_biClrImportant = 0;
+                biSize = SizeOf();
+                biWidth = width;
+                biHeight = height;
+                biPlanes = 1;
+                biBitCount = bpp;
+                biCompression = 0;
+                biSizeImage = 0;
+                biXPelsPerMeter = 0;
+                biYPelsPerMeter = 0;
+                biClrUsed = 0;
+                biClrImportant = 0;
             }
 
             [SecuritySafeCritical]
@@ -526,7 +724,5 @@ namespace HandyControl.Tools.Interop
             public BitmapHandle hbmMask = null;
             public BitmapHandle hbmColor = null;
         }
-
-        #endregion
     }
 }
\ No newline at end of file

From e3d20382d4702cd16252a76b1285b7d267e1eef3 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 18 Jan 2020 16:55:45 +0800
Subject: [PATCH 14/41] delete redundant codes

---
 .../Themes/Styles/Window.xaml                 |  10 +-
 .../Themes/Styles/Window.xaml                 |  10 +-
 .../Themes/Styles/Window.xaml                 |  10 +-
 .../Window/GlowWindow.xaml                    |  10 +-
 .../Controls/Window/GlowWindow.cs             | 455 +++++-------------
 .../Controls/Window/Window.cs                 |   6 +-
 .../Tools/Interop/InteropMethods.cs           |  86 +---
 .../Tools/Interop/InteropValues.cs            | 114 +----
 8 files changed, 160 insertions(+), 541 deletions(-)

diff --git a/src/Core_30/HandyControl_Core_30/Themes/Styles/Window.xaml b/src/Core_30/HandyControl_Core_30/Themes/Styles/Window.xaml
index 823319e4..15e08920 100644
--- a/src/Core_30/HandyControl_Core_30/Themes/Styles/Window.xaml
+++ b/src/Core_30/HandyControl_Core_30/Themes/Styles/Window.xaml
@@ -48,7 +48,7 @@
     </Style>
 
     <Style TargetType="Window">
-        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="UseLayoutRounding" Value="True"/>
     </Style>
@@ -56,7 +56,7 @@
     <Style x:Key="WindowWin10" TargetType="controls:Window">
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="BorderBrush" Value="#262e2f"/>
-        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="UseLayoutRounding" Value="True"/>
         <Setter Property="NonClientAreaBackground" Value="{DynamicResource RegionBrush}"/>
@@ -178,6 +178,12 @@
         <Setter Property="Background" Value="Transparent"/>
     </Style>
 
+    <Style x:Key="WindowGlow" BasedOn="{StaticResource WindowWin10}" TargetType="controls:GlowWindow">
+        <Setter Property="ActiveGlowColor" Value="#262e2f"/>
+        <Setter Property="InactiveGlowColor" Value="{DynamicResource BorderColor}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+    </Style>
+
     <Style TargetType="controls:ImageBrowser">
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="MinWidth" Value="400"/>
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml
index e4a662a5..b0203625 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml
@@ -49,7 +49,7 @@
     </Style>
 
     <Style TargetType="Window">
-        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="UseLayoutRounding" Value="True"/>
     </Style>
@@ -57,7 +57,7 @@
     <Style x:Key="WindowWin10" BasedOn="{x:Null}" TargetType="controls:Window">
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="BorderBrush" Value="#262e2f"/>
-        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="UseLayoutRounding" Value="True"/>
         <Setter Property="NonClientAreaBackground" Value="{DynamicResource RegionBrush}"/>
@@ -179,8 +179,10 @@
         <Setter Property="Background" Value="Transparent"/>
     </Style>
 
-    <Style x:Key="WindowGlow">
-
+    <Style x:Key="WindowGlow" BasedOn="{StaticResource WindowWin10}" TargetType="controls:GlowWindow">
+        <Setter Property="ActiveGlowColor" Value="#262e2f"/>
+        <Setter Property="InactiveGlowColor" Value="{DynamicResource BorderColor}"/>
+        <Setter Property="BorderThickness" Value="0"/>
     </Style>
 
     <Style TargetType="controls:ImageBrowser">
diff --git a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml
index 0d7b070b..84b09e51 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml
+++ b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml
@@ -48,7 +48,7 @@
     </Style>
 
     <Style TargetType="Window">
-        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="UseLayoutRounding" Value="True"/>
     </Style>
@@ -56,7 +56,7 @@
     <Style x:Key="WindowWin10" TargetType="controls:Window">
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="BorderBrush" Value="#262e2f"/>
-        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="UseLayoutRounding" Value="True"/>
         <Setter Property="NonClientAreaBackground" Value="{DynamicResource RegionBrush}"/>
@@ -178,6 +178,12 @@
         <Setter Property="Background" Value="Transparent"/>
     </Style>
 
+    <Style x:Key="WindowGlow" BasedOn="{StaticResource WindowWin10}" TargetType="controls:GlowWindow">
+        <Setter Property="ActiveGlowColor" Value="#262e2f"/>
+        <Setter Property="InactiveGlowColor" Value="{DynamicResource BorderColor}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+    </Style>
+
     <Style TargetType="controls:ImageBrowser">
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="MinWidth" Value="400"/>
diff --git a/src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml
index 34a7945a..b1bc5e52 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="HandyControlDemo.Window.GlowWindow"
+<hc:GlowWindow x:Class="HandyControlDemo.Window.GlowWindow"
                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"
@@ -6,12 +6,12 @@
                xmlns:hc="https://handyorg.github.io/handycontrol"
                xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
                mc:Ignorable="d"
+               Background="{DynamicResource MainContentBackgroundBrush}"
                WindowStartupLocation="CenterScreen"
                Title="{x:Static langs:Lang.Title}"
+               ActiveGlowColor="{DynamicResource PrimaryColor}"
                Height="450" 
                Width="800" 
                Icon="/HandyControlDemo;component/Resources/Img/icon.ico">
-    <Grid>
-        
-    </Grid>
-</Window>
+    <Border Background="{DynamicResource MainContentForegroundDrawingBrush}"/>
+</hc:GlowWindow>
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs b/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs
index eda2faef..19bcd7c3 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Windows;
@@ -11,17 +10,14 @@ using System.Windows.Threading;
 using HandyControl.Data;
 using HandyControl.Expression.Drawing;
 using HandyControl.Tools;
-using HandyControl.Tools.Extension;
 using HandyControl.Tools.Interop;
 
 namespace HandyControl.Controls
 {
-    public class GlowWindow : System.Windows.Window
+    public class GlowWindow : Window
     {
         internal int DeferGlowChangesCount;
 
-        private IntPtr _ownerForActivate;
-
         private readonly GlowEdge[] _glowEdges = new GlowEdge[4];
 
         private DispatcherTimer _makeGlowVisibleTimer;
@@ -30,12 +26,8 @@ namespace HandyControl.Controls
 
         private bool _useLogicalSizeForRestore;
 
-        private bool _isNonClientStripVisible;
-
         private bool _updatingZOrder;
 
-        private int _lastWindowPlacement;
-
         private Rect _logicalSizeForRestore = Rect.Empty;
 
         public static readonly DependencyProperty ActiveGlowColorProperty = DependencyProperty.Register(
@@ -62,36 +54,16 @@ namespace HandyControl.Controls
             ResizeModeProperty.OverrideMetadata(typeof(GlowWindow), new FrameworkPropertyMetadata(OnResizeModeChanged));
         }
 
-        public void ChangeOwnerForActivate(IntPtr newOwner)
+        #region internal
+
+        internal void EndDeferGlowChanges()
         {
-            _ownerForActivate = newOwner;
+            foreach (var current in LoadedGlowWindows) current.CommitChanges();
         }
 
-        public void ChangeOwner(IntPtr newOwner)
-        {
-            var _ = new WindowInteropHelper(this)
-            {
-                Owner = newOwner
-            };
-            foreach (var current in LoadedGlowWindows) current.ChangeOwner(newOwner);
-            UpdateZOrderOfThisAndOwner();
-        }
+        #endregion
 
-        private static int PressedMouseButtons
-        {
-            get
-            {
-                var num = 0;
-                if (InteropMethods.IsKeyPressed(1)) num |= 1;
-                if (InteropMethods.IsKeyPressed(2)) num |= 2;
-                if (InteropMethods.IsKeyPressed(4)) num |= 16;
-                if (InteropMethods.IsKeyPressed(5)) num |= 32;
-                if (InteropMethods.IsKeyPressed(6)) num |= 64;
-                return num;
-            }
-        }
-
-        private IEnumerable<GlowEdge> LoadedGlowWindows => from w in _glowEdges where w != null select w;
+        #region protected
 
         protected virtual bool ShouldShowGlow
         {
@@ -103,6 +75,114 @@ namespace HandyControl.Controls
             }
         }
 
+        protected virtual IntPtr HwndSourceHook(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        {
+            if (msg <= 71)
+            {
+                if (msg == 6)
+                {
+                    return IntPtr.Zero;
+                }
+
+                if (msg != 12)
+                {
+                    switch (msg)
+                    {
+                        case 70:
+                            WmWindowPosChanging(lParam);
+                            return IntPtr.Zero;
+                        case 71:
+                            WmWindowPosChanged(lParam);
+                            return IntPtr.Zero;
+                        default:
+                            return IntPtr.Zero;
+                    }
+                }
+            }
+            else
+            {
+                if (msg <= 166)
+                {
+                    switch (msg)
+                    {
+                        case 128:
+                            break;
+                        case 129:
+                        case 130:
+                            return IntPtr.Zero;
+                        case 134:
+                            handled = true;
+                            return WmNcActivate(hWnd, wParam);
+                        default:
+                            switch (msg)
+                            {
+                                case 164:
+                                case 165:
+                                case 166:
+                                    handled = true;
+                                    return IntPtr.Zero;
+                                default:
+                                    return IntPtr.Zero;
+                            }
+                    }
+                }
+                else
+                {
+                    switch (msg)
+                    {
+                        case 174:
+                        case 175:
+                            handled = true;
+                            return IntPtr.Zero;
+                        default:
+                            if (msg != 274) return IntPtr.Zero;
+                            WmSysCommand(hWnd, wParam);
+                            return IntPtr.Zero;
+                    }
+                }
+            }
+
+            handled = true;
+            return CallDefWindowProcWithoutVisibleStyle(hWnd, msg, wParam, lParam);
+        }
+
+        protected override void OnActivated(EventArgs e)
+        {
+            UpdateGlowActiveState();
+            base.OnActivated(e);
+        }
+
+        protected override void OnDeactivated(EventArgs e)
+        {
+            UpdateGlowActiveState();
+            base.OnDeactivated(e);
+        }
+
+        protected override void OnClosed(EventArgs e)
+        {
+            StopTimer();
+            DestroyGlowWindows();
+            base.OnClosed(e);
+        }
+
+        protected override void OnSourceInitialized(EventArgs e)
+        {
+            var hwndSource = HwndSource.FromHwnd(new WindowInteropHelper(this).Handle);
+            if (hwndSource != null)
+            {
+                hwndSource.AddHook(HwndSourceHook);
+                CreateGlowWindowHandles();
+            }
+
+            base.OnSourceInitialized(e);
+        }
+
+        #endregion
+
+        #region private
+
+        private IEnumerable<GlowEdge> LoadedGlowWindows => from w in _glowEdges where w != null select w;
+
         private bool IsGlowVisible
         {
             get => _isGlowVisible;
@@ -135,10 +215,7 @@ namespace HandyControl.Controls
             customChromeWindow.UpdateGlowVisibility(false);
         }
 
-        private static void OnGlowColorChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
-        {
-            ((GlowWindow)obj).UpdateGlowColors();
-        }
+        private static void OnGlowColorChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args) => ((GlowWindow)obj).UpdateGlowColors();
 
         private void UpdateGlowColors()
         {
@@ -208,11 +285,6 @@ namespace HandyControl.Controls
 
         private IDisposable DeferGlowChanges() => new ChangeScope(this);
 
-        internal void EndDeferGlowChanges()
-        {
-            foreach (var current in LoadedGlowWindows) current.CommitChanges();
-        }
-
         private void UpdateGlowActiveState()
         {
             using (DeferGlowChanges())
@@ -235,13 +307,7 @@ namespace HandyControl.Controls
             }
         }
 
-        private void WmActivate(IntPtr wParam, IntPtr lParam)
-        {
-            if (_ownerForActivate != IntPtr.Zero)
-                InteropMethods.SendMessage(_ownerForActivate, InteropMethods.NOTIFYOWNERACTIVATE, wParam, lParam);
-        }
-
-        private void WmWindowPosChanging(IntPtr hwnd, IntPtr lParam)
+        private void WmWindowPosChanging(IntPtr lParam)
         {
             var windowpos = (InteropValues.WINDOWPOS)Marshal.PtrToStructure(lParam, typeof(InteropValues.WINDOWPOS));
             if ((windowpos.flags & 2u) == 0u && (windowpos.flags & 1u) == 0u && windowpos.cx > 0 && windowpos.cy > 0)
@@ -263,72 +329,6 @@ namespace HandyControl.Controls
             }
         }
 
-        private static InteropValues.RECT GetClientRectRelativeToWindowRect(IntPtr hWnd)
-        {
-            InteropMethods.GetWindowRect(hWnd, out var rect);
-            InteropMethods.GetClientRect(hWnd, out var result);
-            var point = new InteropValues.POINT
-            {
-                X = 0,
-                Y = 0
-            };
-            InteropMethods.ClientToScreen(hWnd, ref point);
-            result.Offset(point.X - rect.Left, point.Y - rect.Top);
-            return result;
-        }
-
-        private void UpdateMaximizedClipRegion(IntPtr hWnd)
-        {
-            var clientRectRelativeToWindowRect = GetClientRectRelativeToWindowRect(hWnd);
-            if (_isNonClientStripVisible) clientRectRelativeToWindowRect.Bottom++;
-
-            var hRgn = InteropMethods.CreateRectRgnIndirect(ref clientRectRelativeToWindowRect);
-            InteropMethods.SetWindowRgn(hWnd, hRgn, InteropMethods.IsWindowVisible(hWnd));
-        }
-
-        private IntPtr ComputeRoundRectRegion(int left, int top, int width, int height, int cornerRadius)
-        {
-            var nWidthEllipse = (int)(2 * cornerRadius * DpiHelper.LogicalToDeviceUnitsScalingFactorX);
-            var nHeightEllipse = (int)(2 * cornerRadius * DpiHelper.LogicalToDeviceUnitsScalingFactorY);
-            return InteropMethods.CreateRoundRectRgn(left, top, left + width + 1, top + height + 1, nWidthEllipse,
-                nHeightEllipse);
-        }
-
-        protected void SetRoundRect(IntPtr hWnd, int width, int height)
-        {
-            var hRgn = ComputeRoundRectRegion(0, 0, width, height, 0);
-            InteropMethods.SetWindowRgn(hWnd, hRgn, InteropMethods.IsWindowVisible(hWnd));
-        }
-
-        protected virtual bool UpdateClipRegionCore(IntPtr hWnd, int showCmd, ClipRegionChangeType changeType, Int32Rect currentBounds)
-        {
-            if (showCmd == 3)
-            {
-                UpdateMaximizedClipRegion(hWnd);
-                return true;
-            }
-
-            if (changeType == ClipRegionChangeType.FromSize || changeType == ClipRegionChangeType.FromPropertyChange ||
-                _lastWindowPlacement != showCmd)
-            {
-                SetRoundRect(hWnd, currentBounds.Width, currentBounds.Height);
-                return true;
-            }
-
-            return false;
-        }
-
-        private void UpdateClipRegion(IntPtr hWnd, InteropValues.WINDOWPLACEMENT placement, ClipRegionChangeType changeType,
-            InteropValues.RECT currentBounds)
-        {
-            UpdateClipRegionCore(hWnd, placement.showCmd, changeType, currentBounds.ToInt32Rect());
-            _lastWindowPlacement = placement.showCmd;
-        }
-
-        protected virtual void OnWindowPosChanged(IntPtr hWnd, int showCmd, Int32Rect rcNormalPosition)
-        {
-        }
-
         private void UpdateZOrderOfOwner(IntPtr hwndOwner)
         {
             var lastOwnedWindow = IntPtr.Zero;
@@ -366,34 +366,22 @@ namespace HandyControl.Controls
             }
         }
 
-        private void WmWindowPosChanged(IntPtr hWnd, IntPtr lParam)
+        private void WmWindowPosChanged(IntPtr lParam)
         {
             try
             {
                 var windowpos = (InteropValues.WINDOWPOS)Marshal.PtrToStructure(lParam, typeof(InteropValues.WINDOWPOS));
-                var windowPlacement = InteropMethods.GetWindowPlacement(hWnd);
-                var currentBounds = new InteropValues.RECT(windowpos.x, windowpos.y, windowpos.x + windowpos.cx,
-                    windowpos.y + windowpos.cy);
-                if ((windowpos.flags & 1u) != 1u)
-                {
-                    UpdateClipRegion(hWnd, windowPlacement, ClipRegionChangeType.FromSize, currentBounds);
-                }
-                else
-                {
-                    if ((windowpos.flags & 2u) != 2u)
-                        UpdateClipRegion(hWnd, windowPlacement, ClipRegionChangeType.FromPosition, currentBounds);
-                }
 
-                OnWindowPosChanged(hWnd, windowPlacement.showCmd, windowPlacement.rcNormalPosition.ToInt32Rect());
                 UpdateGlowWindowPositions((windowpos.flags & 64u) == 0u);
                 UpdateZOrderOfThisAndOwner();
             }
-            catch (Win32Exception)
+            catch
             {
+                // ignored
             }
         }
 
-        internal Rect GetOnScreenPosition(Rect floatRect)
+        private Rect GetOnScreenPosition(Rect floatRect)
         {
             var result = floatRect;
             floatRect = floatRect.LogicalToDeviceUnits();
@@ -422,90 +410,7 @@ namespace HandyControl.Controls
             return result;
         }
 
-        private InteropValues.WINDOWINFO GetWindowInfo(IntPtr hWnd)
-        {
-            var windowInfo = default(InteropValues.WINDOWINFO);
-            windowInfo.cbSize = Marshal.SizeOf(windowInfo);
-            InteropMethods.GetWindowInfo(hWnd, ref windowInfo);
-            return windowInfo;
-        }
-
-        private IntPtr WmNcCalcSize(IntPtr hWnd, IntPtr wParam, IntPtr lParam, ref bool handled)
-        {
-            _isNonClientStripVisible = false;
-            var windowPlacement = InteropMethods.GetWindowPlacement(hWnd);
-            var flag = windowPlacement.showCmd == 3;
-            if (flag)
-            {
-                var rect = (InteropValues.RECT)Marshal.PtrToStructure(lParam, typeof(InteropValues.RECT));
-                InteropMethods.DefWindowProc(hWnd, 131, wParam, lParam);
-                var rect2 = (InteropValues.RECT)Marshal.PtrToStructure(lParam, typeof(InteropValues.RECT));
-                var monitorinfo = MonitorInfoFromWindow(hWnd);
-                if (monitorinfo.rcMonitor.Height == monitorinfo.rcWork.Height &&
-                    monitorinfo.rcMonitor.Width == monitorinfo.rcWork.Width)
-                {
-                    _isNonClientStripVisible = true;
-                    rect2.Bottom--;
-                }
-
-                rect2.Top = rect.Top + (int)GetWindowInfo(hWnd).cyWindowBorders;
-                Marshal.StructureToPtr(rect2, lParam, true);
-            }
-
-            handled = true;
-            return IntPtr.Zero;
-        }
-
-        private IntPtr WmNcHitTest(IntPtr hWnd, IntPtr lParam, ref bool handled)
-        {
-            if (PresentationSource.FromDependencyObject(this) == null) return new IntPtr(0);
-
-            var point = new Point(InteropMethods.GetXLParam(lParam.ToInt32()),
-                InteropMethods.GetYLParam(lParam.ToInt32()));
-            var point2 = PointFromScreen(point);
-            DependencyObject visualHit = null;
-            VisualHelper.HitTestVisibleElements(this, delegate (HitTestResult target)
-            {
-                visualHit = target.VisualHit;
-                return HitTestResultBehavior.Stop;
-            }, new PointHitTestParameters(point2));
-
-            var num = 0;
-            while (visualHit != null)
-            {
-                //var nonClientArea = visualHit as INonClientArea;
-                //if (nonClientArea != null)
-                //{
-                //    num = nonClientArea.HitTest(point);
-                //    if (num != 0) break;
-                //}
-
-                visualHit = visualHit.GetVisualOrLogicalParent();
-            }
-
-            if (num == 0) num = 1;
-            handled = true;
-            return new IntPtr(num);
-        }
-
-        private IntPtr WmNcActivate(IntPtr hWnd, IntPtr wParam, IntPtr lParam, ref bool handled)
-        {
-            handled = true;
-            return InteropMethods.DefWindowProc(hWnd, 134, wParam, InteropMethods.HRGN_NONE);
-        }
-
-        private static void RaiseNonClientMouseMessageAsClient(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam)
-        {
-            var point = new InteropValues.POINT
-            {
-                X = InteropMethods.GetXLParam(lParam.ToInt32()),
-                Y = InteropMethods.GetYLParam(lParam.ToInt32())
-            };
-
-            InteropMethods.ScreenToClient(hWnd, ref point);
-            InteropMethods.SendMessage(hWnd, msg + 513 - 161, new IntPtr(PressedMouseButtons),
-                InteropMethods.MakeParam(point.X, point.Y));
-        }
+        private IntPtr WmNcActivate(IntPtr hWnd, IntPtr wParam) => InteropMethods.DefWindowProc(hWnd, 134, wParam, InteropMethods.HRGN_NONE);
 
         private bool IsAeroSnappedToMonitor(IntPtr hWnd)
         {
@@ -515,7 +420,7 @@ namespace HandyControl.Controls
             return MathHelper.AreClose(monitorinfo.rcWork.Height, logicalRect.Height) && MathHelper.AreClose(monitorinfo.rcWork.Top, logicalRect.Top);
         }
 
-        private void WmSysCommand(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        private void WmSysCommand(IntPtr hWnd, IntPtr wParam)
         {
             var num = InteropMethods.GET_SC_WPARAM(wParam);
             if (num == 61456)
@@ -537,130 +442,20 @@ namespace HandyControl.Controls
             }
         }
 
-        private IntPtr CallDefWindowProcWithoutVisibleStyle(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        private IntPtr CallDefWindowProcWithoutVisibleStyle(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam)
         {
             var flag = VisualHelper.ModifyStyle(hWnd, 268435456, 0);
             var result = InteropMethods.DefWindowProc(hWnd, msg, wParam, lParam);
             if (flag) VisualHelper.ModifyStyle(hWnd, 0, 268435456);
-            handled = true;
             return result;
         }
 
-        protected virtual IntPtr HwndSourceHook(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
-        {
-            if (msg <= 71)
-            {
-                if (msg == 6)
-                {
-                    WmActivate(wParam, lParam);
-                    goto IL_11C;
-                }
-
-                if (msg != 12)
-                    switch (msg)
-                    {
-                        case 70:
-                            WmWindowPosChanging(hWnd, lParam);
-                            goto IL_11C;
-                        case 71:
-                            WmWindowPosChanged(hWnd, lParam);
-                            goto IL_11C;
-                        default:
-                            goto IL_11C;
-                    }
-            }
-            else
-            {
-                if (msg <= 166)
-                    switch (msg)
-                    {
-                        case 128:
-                            break;
-                        case 129:
-                        case 130:
-                            goto IL_11C;
-                        case 131:
-                            return WmNcCalcSize(hWnd, wParam, lParam, ref handled);
-                        case 132:
-                            return WmNcHitTest(hWnd, lParam, ref handled);
-                        //case 133:
-                        //    return WmNcPaint(hWnd, wParam, lParam, ref handled);
-                        case 134:
-                            return WmNcActivate(hWnd, wParam, lParam, ref handled);
-                        default:
-                            switch (msg)
-                            {
-                                case 164:
-                                case 165:
-                                case 166:
-                                    RaiseNonClientMouseMessageAsClient(hWnd, msg, wParam, lParam);
-                                    handled = true;
-                                    goto IL_11C;
-                                default:
-                                    goto IL_11C;
-                            }
-                    }
-                else
-                    switch (msg)
-                    {
-                        case 174:
-                        case 175:
-                            handled = true;
-                            goto IL_11C;
-                        default:
-                            if (msg != 274) goto IL_11C;
-                            WmSysCommand(hWnd, wParam, lParam);
-                            goto IL_11C;
-                    }
-            }
-
-            return CallDefWindowProcWithoutVisibleStyle(hWnd, msg, wParam, lParam, ref handled);
-        IL_11C:
-            return IntPtr.Zero;
-        }
-
         private void CreateGlowWindowHandles()
         {
             for (var i = 0; i < _glowEdges.Length; i++) GetOrCreateGlowWindow(i).EnsureHandle();
         }
 
-        protected override void OnActivated(EventArgs e)
-        {
-            UpdateGlowActiveState();
-            base.OnActivated(e);
-        }
+        #endregion
 
-        protected override void OnDeactivated(EventArgs e)
-        {
-            UpdateGlowActiveState();
-            base.OnDeactivated(e);
-        }
-
-        protected override void OnClosed(EventArgs e)
-        {
-            StopTimer();
-            DestroyGlowWindows();
-            base.OnClosed(e);
-        }
-
-        protected override void OnSourceInitialized(EventArgs e)
-        {
-            var hwndSource = HwndSource.FromHwnd(new WindowInteropHelper(this).Handle);
-            if (hwndSource != null)
-            {
-                hwndSource.AddHook(HwndSourceHook);
-                CreateGlowWindowHandles();
-            }
-
-            base.OnSourceInitialized(e);
-        }
-
-        protected enum ClipRegionChangeType
-        {
-            FromSize,
-            FromPosition,
-            FromPropertyChange,
-            FromUndockSingleTab
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/Window.cs b/src/Shared/HandyControl_Shared/Controls/Window/Window.cs
index fecf17ba..5d190fb6 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/Window.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/Window.cs
@@ -63,7 +63,7 @@ namespace HandyControl.Controls
 
         public static readonly DependencyProperty NonClientAreaHeightProperty = DependencyProperty.Register(
             "NonClientAreaHeight", typeof(double), typeof(Window),
-            new PropertyMetadata(26.0));
+            new PropertyMetadata(22.0));
 
         public static readonly DependencyProperty ShowNonClientAreaProperty = DependencyProperty.Register(
             "ShowNonClientArea", typeof(bool), typeof(Window),
@@ -80,8 +80,6 @@ namespace HandyControl.Controls
 
         private Thickness _actualBorderThickness;
 
-        private UIElement _nonClientArea;
-
         private bool _showNonClientArea = true;
 
         private double _tempNonClientAreaHeight;
@@ -92,6 +90,8 @@ namespace HandyControl.Controls
 
         private ResizeMode _tempResizeMode;
 
+        private UIElement _nonClientArea;
+
         static Window()
         {
             StyleProperty.OverrideMetadata(typeof(Window), new FrameworkPropertyMetadata(Application.Current.FindResource(ResourceToken.WindowWin10)));
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs b/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs
index 361d0853..2af265bf 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs
@@ -10,17 +10,12 @@ namespace HandyControl.Tools.Interop
 {
     internal class InteropMethods
     {
-        private static int vsmNotifyOwnerActivate;
-
-        public static readonly IntPtr HRGN_NONE = new IntPtr(-1);
+        internal static readonly IntPtr HRGN_NONE = new IntPtr(-1);
 
         [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
         [ResourceExposure(ResourceScope.None)]
         internal static extern int RegisterWindowMessage(string msg);
 
-        [DllImport(InteropValues.ExternDll.User32, SetLastError = true, CharSet = CharSet.Auto)]
-        internal static extern int MapWindowPoints(IntPtr hWndFrom, IntPtr hWndTo, ref InteropValues.RECT lpPoints, uint cPoints);
-
         [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
         internal static extern bool ReadProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, out InteropValues.TBBUTTON lpBuffer,
             int dwSize, out int lpNumberOfBytesRead);
@@ -282,18 +277,6 @@ namespace HandyControl.Tools.Interop
         [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
         internal static extern IntPtr GetDC(IntPtr ptr);
 
-        internal static int NOTIFYOWNERACTIVATE
-        {
-            get
-            {
-                if (vsmNotifyOwnerActivate == 0)
-                {
-                    vsmNotifyOwnerActivate = RegisterWindowMessage("NOTIFYOWNERACTIVATE{A982313C-756C-4da9-8BD0-0C375A45784B}");
-                }
-                return vsmNotifyOwnerActivate;
-            }
-        }
-
         [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
         [return: MarshalAs(UnmanagedType.Bool)]
         private static extern bool GetWindowPlacement(IntPtr hwnd, InteropValues.WINDOWPLACEMENT lpwndpl);
@@ -307,23 +290,6 @@ namespace HandyControl.Tools.Interop
             }
             throw new Win32Exception(Marshal.GetLastWin32Error());
         }
-        
-        [DllImport(InteropValues.ExternDll.User32)]
-        internal static extern int GetSystemMetrics(int index);
-        
-        [DllImport(InteropValues.ExternDll.User32)]
-        internal static extern int TrackPopupMenuEx(IntPtr hmenu, uint fuFlags, int x, int y, IntPtr hwnd, IntPtr lptpm);
-        
-        [DllImport(InteropValues.ExternDll.User32)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool EnableMenuItem(IntPtr menu, uint uIDEnableItem, uint uEnable);
-        
-        [DllImport(InteropValues.ExternDll.User32)]
-        internal static extern short GetKeyState(int vKey);
-        
-        internal static bool IsKeyPressed(int vKey) => GetKeyState(vKey) < 0;
-
-        internal static IntPtr MakeParam(int lowWord, int highWord) => new IntPtr((lowWord & 65535) | highWord << 16);
 
         internal static int GetXLParam(int lParam) => LoWord(lParam);
 
@@ -332,29 +298,14 @@ namespace HandyControl.Tools.Interop
         internal static int HiWord(int value) => (short)(value >> 16);
 
         internal static int LoWord(int value) => (short)(value & 65535);
-
-        [DllImport(InteropValues.ExternDll.User32)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool ScreenToClient(IntPtr hWnd, ref InteropValues.POINT point);
         
         [DllImport(InteropValues.ExternDll.User32)]
         internal static extern IntPtr MonitorFromWindow(IntPtr handle, int flags);
         
-        [DllImport(InteropValues.ExternDll.User32)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool ClientToScreen(IntPtr hWnd, ref InteropValues.POINT point);
-        
         [DllImport(InteropValues.ExternDll.User32)]
         [return: MarshalAs(UnmanagedType.Bool)]
         internal static extern bool EnumThreadWindows(uint dwThreadId, InteropValues.EnumWindowsProc lpfn, IntPtr lParam);
         
-        [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool PostMessage(IntPtr hWnd, int nMsg, IntPtr wParam, IntPtr lParam);
-
-        [DllImport(InteropValues.ExternDll.User32)]
-        internal static extern IntPtr GetDCEx(IntPtr hWnd, IntPtr hrgnClip, int dwFlags);
-        
         [DllImport(InteropValues.ExternDll.Gdi32)]
         [return: MarshalAs(UnmanagedType.Bool)]
         internal static extern bool DeleteDC(IntPtr hdc);
@@ -364,24 +315,6 @@ namespace HandyControl.Tools.Interop
 
         [DllImport(InteropValues.ExternDll.Gdi32, ExactSpelling = true, SetLastError = true)]
         internal static extern IntPtr SelectObject(IntPtr hdc, IntPtr hgdiobj);
-        
-        [DllImport(InteropValues.ExternDll.Gdi32, CallingConvention = CallingConvention.StdCall, ExactSpelling = true)]
-        internal static extern IntPtr CreateRoundRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, int nWidthEllipse, int nHeightEllipse);
-        
-        [DllImport(InteropValues.ExternDll.Gdi32, CallingConvention = CallingConvention.StdCall, ExactSpelling = true)]
-        internal static extern IntPtr CreateRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
-        
-        [DllImport(InteropValues.ExternDll.Gdi32, CallingConvention = CallingConvention.StdCall, ExactSpelling = true)]
-        internal static extern IntPtr CreateRectRgnIndirect(ref InteropValues.RECT lprc);
-        
-        [DllImport(InteropValues.ExternDll.Gdi32, CallingConvention = CallingConvention.StdCall, ExactSpelling = true)]
-        private static extern int CombineRgn(IntPtr hrngDest, IntPtr hrgnSrc1, IntPtr hrgnSrc2, int fnCombineMode);
-
-        internal static int CombineRgn(IntPtr hrnDest, IntPtr hrgnSrc1, IntPtr hrgnSrc2,
-            InteropValues.CombineMode combineMode) => CombineRgn(hrnDest, hrgnSrc1, hrgnSrc2, (int) combineMode);
-
-        [DllImport(InteropValues.ExternDll.User32, CallingConvention = CallingConvention.StdCall, ExactSpelling = true)]
-        internal static extern int SetWindowRgn(IntPtr hWnd, IntPtr hRgn, [MarshalAs(UnmanagedType.Bool)] bool redraw);
 
         [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Unicode, SetLastError = true)]
         internal static extern IntPtr SendMessage(IntPtr hWnd, int nMsg, IntPtr wParam, IntPtr lParam);
@@ -391,10 +324,6 @@ namespace HandyControl.Tools.Interop
         
         [DllImport(InteropValues.ExternDll.User32)]
         internal static extern IntPtr GetWindow(IntPtr hwnd, int nCmd);
-        
-        [DllImport(InteropValues.ExternDll.User32)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool GetWindowInfo(IntPtr hwnd, ref InteropValues.WINDOWINFO pwi);
 
         [DllImport(InteropValues.ExternDll.User32)]
         [return: MarshalAs(UnmanagedType.Bool)]
@@ -427,10 +356,6 @@ namespace HandyControl.Tools.Interop
         private static extern int GetWindowLong(IntPtr hWnd, int nIndex);
 
         internal static int GetWindowLong(IntPtr hWnd, InteropValues.GWL nIndex) => GetWindowLong(hWnd, (int)nIndex);
-        
-        [DllImport(InteropValues.ExternDll.User32)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool GetClientRect(IntPtr hwnd, out InteropValues.RECT lpRect);
 
         internal static IntPtr SetWindowLong(IntPtr hWnd, int nIndex, IntPtr dwNewLong)
         {
@@ -473,9 +398,6 @@ namespace HandyControl.Tools.Interop
         [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Unicode, SetLastError = true)]
         internal static extern IntPtr CreateWindowEx(int dwExStyle, IntPtr classAtom, string lpWindowName, int dwStyle, int x, int y, int nWidth, int nHeight, IntPtr hWndParent, IntPtr hMenu, IntPtr hInstance, IntPtr lpParam);
 
-        [DllImport(InteropValues.ExternDll.Gdi32)]
-        internal static extern IntPtr CreateSolidBrush(int colorref);
-
         [DllImport(InteropValues.ExternDll.User32)]
         [return: MarshalAs(UnmanagedType.Bool)]
         internal static extern bool DestroyWindow(IntPtr hwnd);
@@ -490,11 +412,7 @@ namespace HandyControl.Tools.Interop
         
         [DllImport(InteropValues.ExternDll.User32)]
         internal static extern bool RedrawWindow(IntPtr hWnd, IntPtr lprcUpdate, IntPtr hrgnUpdate, InteropValues.RedrawWindowFlags flags);
-        
-        [DllImport(InteropValues.ExternDll.User32)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool FillRect(IntPtr hDC, ref InteropValues.RECT rect, IntPtr hbrush);
-        
+
         [DllImport(InteropValues.ExternDll.User32)]
         [return: MarshalAs(UnmanagedType.Bool)]
         internal static extern bool EnumDisplayMonitors(IntPtr hdc, IntPtr lprcClip, InteropValues.EnumMonitorsDelegate lpfnEnum, IntPtr dwData);
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs b/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
index 0a605703..c183fb44 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
@@ -26,12 +26,7 @@ namespace HandyControl.Tools.Interop
 
         internal delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
 
-        internal delegate IntPtr SubclassProc(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam, UIntPtr id, IntPtr refData);
-
-        internal delegate IntPtr WindowsHookProc(CbtHookAction code, IntPtr wParam, IntPtr lParam);
-
         internal const int
-            WS_CHILD = 0x40000000,
             BITSPIXEL = 12,
             PLANES = 14,
             BI_RGB = 0,
@@ -40,9 +35,6 @@ namespace HandyControl.Tools.Interop
             NIF_ICON = 0x00000002,
             NIF_TIP = 0x00000004,
             NIF_INFO = 0x00000010,
-            NIN_BALLOONSHOW = WM_USER + 2,
-            NIN_BALLOONHIDE = WM_USER + 3,
-            NIN_BALLOONTIMEOUT = WM_USER + 4,
             NIM_ADD = 0x00000000,
             NIM_MODIFY = 0x00000001,
             NIM_DELETE = 0x00000002,
@@ -50,22 +42,15 @@ namespace HandyControl.Tools.Interop
             NIIF_INFO = 0x00000001,
             NIIF_WARNING = 0x00000002,
             NIIF_ERROR = 0x00000003,
-            NIIF_LARGE_ICON = 0x00000020,
             WM_KEYDOWN = 0x0100,
             WM_KEYUP = 0x0101,
             WM_SYSKEYDOWN = 0x0104,
             WM_SYSKEYUP = 0x0105,
             WM_SYSCOMMAND = 0x112,
             WM_MOUSEMOVE = 0x0200,
-            WM_LBUTTONDOWN = 0x0201,
             WM_LBUTTONUP = 0x0202,
             WM_LBUTTONDBLCLK = 0x0203,
-            WM_RBUTTONDOWN = 0x0204,
             WM_RBUTTONUP = 0x0205,
-            WM_RBUTTONDBLCLK = 0x0206,
-            WM_MBUTTONDOWN = 0x0207,
-            WM_MBUTTONUP = 0x0208,
-            WM_MBUTTONDBLCLK = 0x0209,
             WM_CLIPBOARDUPDATE = 0x031D,
             WM_USER = 0x0400,
             MF_BYPOSITION = 0x400,
@@ -73,22 +58,10 @@ namespace HandyControl.Tools.Interop
             TB_GETBUTTON = WM_USER + 23,
             TB_BUTTONCOUNT = WM_USER + 24,
             TB_GETITEMRECT = WM_USER + 29,
-            STANDARD_RIGHTS_REQUIRED = 0x000F0000,
-            SYNCHRONIZE = 0x00100000,
-            PROCESS_ALL_ACCESS = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0xFFF,
-            MEM_COMMIT = 0x1000,
-            MEM_RELEASE = 0x8000,
-            PAGE_READWRITE = 0x04,
-            TBSTATE_HIDDEN = 0x08,
             VERTRES = 10,
-            HORZRES = 8,
             DESKTOPVERTRES = 117,
-            DESKTOPHORZRES = 118,
             LOGPIXELSX = 88,
-            LOGPIXELSY = 90,
-            CXFRAME = 32,
-            CXSIZEFRAME = CXFRAME,
-            SW_HIDE = 0;
+            LOGPIXELSY = 90;
 
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
         internal class NOTIFYICONDATA
@@ -220,14 +193,6 @@ namespace HandyControl.Tools.Interop
             public int Right;
             public int Bottom;
 
-            public RECT(int left, int top, int right, int bottom)
-            {
-                Left = left;
-                Top = top;
-                Right = right;
-                Bottom = bottom;
-            }
-
             public RECT(Rect rect)
             {
                 Left = (int)rect.Left;
@@ -250,16 +215,6 @@ namespace HandyControl.Tools.Interop
                 get => Right - Left;
                 set => Right = Left + value;
             }
-
-            public void Offset(int dx, int dy)
-            {
-                Left += dx;
-                Right += dx;
-                Top += dy;
-                Bottom += dy;
-            }
-
-            public Int32Rect ToInt32Rect() => new Int32Rect(Left, Top, Width, Height);
         }
 
         internal struct BLENDFUNCTION
@@ -269,11 +224,13 @@ namespace HandyControl.Tools.Interop
             public byte SourceConstantAlpha;
             public byte AlphaFormat;
         }
+
         internal enum GWL
         {
             STYLE = -16,
             EXSTYLE = -20
         }
+        
         internal enum GWLP
         {
             WNDPROC = -4,
@@ -282,26 +239,6 @@ namespace HandyControl.Tools.Interop
             USERDATA = -21,
             ID = -12
         }
-        internal enum CombineMode
-        {
-            RGN_AND = 1,
-            RGN_OR,
-            RGN_XOR,
-            RGN_DIFF,
-            RGN_COPY,
-            RGN_MIN = 1,
-            RGN_MAX = 5
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal class BITMAPFILEHEADER
-        {
-            public ushort bfType;
-            public uint bfSize;
-            public ushort bfReserved1;
-            public ushort bfReserved2;
-            public uint bfOffBits;
-        }
 
         internal struct BITMAPINFOHEADER
         {
@@ -318,23 +255,6 @@ namespace HandyControl.Tools.Interop
             internal uint biClrImportant;
         }
 
-        internal struct PictDescBitmap
-        {
-            internal int cbSizeOfStruct;
-            internal int pictureType;
-            internal IntPtr hBitmap;
-            internal IntPtr hPalette;
-            internal int unused;
-            internal static PictDescBitmap Default =>
-                new PictDescBitmap
-                {
-                    cbSizeOfStruct = 20,
-                    pictureType = 1,
-                    hBitmap = IntPtr.Zero,
-                    hPalette = IntPtr.Zero
-                };
-        }
-
         [Flags]
         internal enum RedrawWindowFlags : uint
         {
@@ -352,20 +272,6 @@ namespace HandyControl.Tools.Interop
             NoFrame = 2048u
         }
 
-        internal enum CbtHookAction
-        {
-            HCBT_MOVESIZE,
-            HCBT_MINMAX,
-            HCBT_QS,
-            HCBT_CREATEWND,
-            HCBT_DESTROYWND,
-            HCBT_ACTIVATE,
-            HCBT_CLICKSKIPPED,
-            HCBT_KEYSKIPPED,
-            HCBT_SYSCOMMAND,
-            HCBT_SETFOCUS
-        }
-
         [StructLayout(LayoutKind.Sequential)]
         internal class WINDOWPOS
         {
@@ -389,20 +295,6 @@ namespace HandyControl.Tools.Interop
             public RECT rcNormalPosition;
         }
 
-        internal struct WINDOWINFO
-        {
-            public int cbSize;
-            public RECT rcWindow;
-            public RECT rcClient;
-            public int dwStyle;
-            public int dwExStyle;
-            public uint dwWindowStatus;
-            public uint cxWindowBorders;
-            public uint cyWindowBorders;
-            public ushort atomWindowType;
-            public ushort wCreatorVersion;
-        }
-
         [StructLayout(LayoutKind.Sequential, Pack = 4)]
         internal struct SIZE
         {

From 0223ba56726f1b80d69aa653924d532607c8b218 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 18 Jan 2020 17:05:50 +0800
Subject: [PATCH 15/41] update readme

---
 README.md                                             | 8 ++++++--
 src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index f2aeea26..9f0b8faa 100644
--- a/README.md
+++ b/README.md
@@ -97,6 +97,10 @@ Step 4：enjoy coding
 
 ## Latest examples
 
+### GlowWindow
+
+![GlowWindow](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/GlowWindow.png)
+
 ### FlowDocumentScrollViewerStyle
 
 ![FlowDocumentScrollViewerStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/FlowDocumentScrollViewer.png)
@@ -113,12 +117,12 @@ Step 4：enjoy coding
 
 ![RelativePanel](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/RelativePanel.png)
 
+## History publication
+
 ### Drawer
 
 ![Drawer](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Drawer.gif)
 
-## History publication
-
 ### Poptip
 
 ![Poptip](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Poptip.gif)
diff --git a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json
index 89503cad..93c1b5dc 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json
+++ b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json
@@ -74,7 +74,7 @@
       [ "WaterfallPanel", "WaterfallPanelDemoCtl", "Panel_16x", "" ],
       [ "HoneycombPanel", "HoneycombPanelDemoCtl", "PolygonHexagon_16x", "" ],
       [ "TransitioningContentControl", "TransitioningContentControlDemoCtl", "TransitioningContentControl_16x", "" ],
-      [ "Drawer", "DrawerDemoCtl", "View_Portrait_16x", "1" ],
+      [ "Drawer", "DrawerDemoCtl", "View_Portrait_16x", "" ],
       [ "CoverView", "CoverViewDemoCtl", "DetailDataView_16x", "" ],
       [ "CoverFlow", "CoverFlowDemoCtl", "LinearCarousel_16x", "" ],
       [ "ProgressBar", "ProgressBarDemoCtl", "ProgressBar_16x", "" ],

From e9811784c293bba76d990c58bf6f308714a5cbf1 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 18 Jan 2020 17:10:40 +0800
Subject: [PATCH 16/41] update contributors

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 9f0b8faa..b644e505 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,7 @@
 <a href="https://github.com/xianyun666" target="_blank"><img width="64px" src="https://avatars1.githubusercontent.com/u/22339210?s=400&v=4"></a>
 <a href="https://github.com/afunc233" target="_blank"><img width="64px" src="https://avatars1.githubusercontent.com/u/19919631?s=400&v=4"></a>
 <a href="https://github.com/DinoChan" target="_blank"><img width="64px" src="https://avatars1.githubusercontent.com/u/6076257?s=400&v=4"></a>
+<a href="https://github.com/MrZhangYuan" target="_blank"><img width="64px" src="https://avatars2.githubusercontent.com/u/16384123?s=400&v=4"></a>
 
 ## Backers
 

From 359b438ba367a70a8ce4d1b80466c21f3a147d13 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 18 Jan 2020 17:49:47 +0800
Subject: [PATCH 17/41] Update TextBoxBaseStyle.xaml

---
 .../Themes/Styles/Base/TextBoxBaseStyle.xaml         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml
index b2179bd3..97beb5d6 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml
@@ -24,7 +24,7 @@
                 <ControlTemplate TargetType="controls:WatermarkTextBox">
                     <controls:SimplePanel x:Name="WatermarkContent">
                         <TextBlock Text="{TemplateBinding Watermark}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Foreground="{DynamicResource ThirdlyTextBrush}" Margin="{TemplateBinding Padding}" x:Name="PART_Watermark" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}"/>
-                        <ScrollViewer Style="{x:Null}" Padding="{TemplateBinding Padding}" Margin="-2,0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                        <ScrollViewer Padding="{TemplateBinding Padding}" Margin="-2,0,-1,0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
                     </controls:SimplePanel>
                 </ControlTemplate>
             </Setter.Value>
@@ -51,7 +51,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="TextBox">
                     <Border x:Name="border" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                        <ScrollViewer Style="{x:Null}" Padding="{TemplateBinding Padding}" Margin="-2,0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                        <ScrollViewer Padding="{TemplateBinding Padding}" Margin="-2,0,-1,0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="false">
@@ -81,7 +81,7 @@
             </StackPanel>
             <Border x:Name="border" Grid.Row="1" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"/>
             <TextBlock x:Name="Placeholder" Padding="1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Row="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}"/>
-            <ScrollViewer Style="{x:Null}" Padding="{TemplateBinding Padding}" Margin="-1,1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Row="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+            <ScrollViewer Padding="{TemplateBinding Padding}" Margin="-1,1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Row="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="false">
@@ -110,7 +110,7 @@
             </StackPanel>
             <Border x:Name="border" Grid.Column="1" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"/>
             <TextBlock x:Name="Placeholder" Padding="1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Column="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}"/>
-            <ScrollViewer Style="{x:Null}" Padding="{TemplateBinding Padding}" Margin="-1,1" Grid.Column="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+            <ScrollViewer Padding="{TemplateBinding Padding}" Margin="-1,1" Grid.Column="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="false">
@@ -167,7 +167,7 @@
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
                     <TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}"/>
-                    <ScrollViewer Style="{x:Null}" Margin="-2,0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                    <ScrollViewer Margin="-2,0,-1,0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
                     <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" controls:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}"/>
                 </Grid>
             </Border>
@@ -227,7 +227,7 @@
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
                     <TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}"/>
-                    <ScrollViewer Style="{x:Null}" Grid.Column="0" Margin="-2,0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                    <ScrollViewer Grid.Column="0" Margin="-2,0,-1,0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
                     <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" controls:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}"/>
                 </Grid>
             </Border>

From e0663ae2446e945ccc284d5fa0d3591132bd0920 Mon Sep 17 00:00:00 2001
From: DinoChan <dino.chan@live.com>
Date: Sun, 19 Jan 2020 15:25:55 +0800
Subject: [PATCH 18/41] Add NumericUpDown Document

---
 .../extend_controls/numericUpDown/index.md    | 104 +++++++++++++++++-
 1 file changed, 102 insertions(+), 2 deletions(-)

diff --git a/doc/source/handycontrol/extend_controls/numericUpDown/index.md b/doc/source/handycontrol/extend_controls/numericUpDown/index.md
index ca12ad62..0d5c0042 100644
--- a/doc/source/handycontrol/extend_controls/numericUpDown/index.md
+++ b/doc/source/handycontrol/extend_controls/numericUpDown/index.md
@@ -1,5 +1,105 @@
 ---
-title: 建设中
+title: NumericUpDown
 ---
 
-建设中
\ No newline at end of file
+NumericUpDown 控件看起来像一对用户可以单击来调整值的箭头按钮和TextBox的组合，该控件显示并设置数值(Value)。 用户可以通过单击向上和向下箭头，或通过在控件的TextBox部分中键入一个数字来改变Value。
+
+``` CS
+[TemplatePart(Name = ElementTextBox, Type = typeof(DatePickerTextBox))]
+public class DatePicker : System.Windows.Controls.DatePicker, IDataInput
+```
+
+# 创建NumericUpDown并设置Value
+
+``` XML
+<hc:NumericUpDown Value="100"/>
+```
+
+``` CS
+var numericUpDown = new NumericUpDown();
+numericUpDown.Value = 100;
+```
+
+生成的NumericUpDown如下图所示：
+
+![NumericUpDown](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/extend_controls/NumericUpDown_1.png)
+
+
+# 设置DecimalPlaces
+
+如果需要改变Value显示的小数位数，可以改变DecimalPlaces。DecimalPlaces是一个**int？**类型，当它为null时不限制显示的小数位数，否则显示的小数位数为DecimalPlaces的Value。
+
+``` XML
+<hc:NumericUpDown DecimalPlaces="2" Value="100.12345"/>
+```
+
+``` CS
+numericUpDown.Value = 10.12345;
+numericUpDown.DecimalPlaces = 2;
+```
+
+![NumericUpDown](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/extend_controls/NumericUpDown_2.png)
+
+# 设置Increment
+
+可以通设置Increment改变单击一下按钮时增加或减少的数量。
+
+``` XML
+<hc:NumericUpDown Value="100" Increment="10"/>
+```
+
+``` CS
+numericUpDown.Increment = 10;
+```
+
+# 设置上限和下限
+
+可以通设置Maximum和Minimum限制Value的上限和下限。
+
+``` XML
+<hc:NumericUpDown Maximum="500" Minimum="10"/>
+```
+
+``` CS
+numericUpDown.Minimum = 10;
+numericUpDown.Maximum = 1000;
+```
+
+# 设置标题和占位符文本
+
+你可以将 Header（标题）和 Placeholder（占位符）添加到NumericUpDown，以向用户指示其用途。要使用这两个附加属性，需要先应用 **NumericUpDownPlus** 样式。
+
+``` XML
+<hc:NumericUpDown hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}"
+                  hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}"
+                  Style="{StaticResource NumericUpDownExtend}" />
+```
+
+![NumericUpDown](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/extend_controls/NumericUpDown_3.png)
+
+# 属性
+
+| 属性             |  描述             |
+| ---------------- | ------------------ |
+| Value      | 获取或设置当前值 |
+| Maximum      | 获取或设置最大允许值 |
+| Minimum      | 获取或设置最小允许值 |
+| Increment      | 获取或设置单击向上或向下按钮时，数字显示框（也称作 up-down 控件）递增或递减的值。 |
+| DecimalPlaces      |获取或设置NumericUpDown中要显示的十进制位数。 此属性不会影响 Value 属性。 |
+| VerifyFunc        | 获取或设置数据验证委托           |
+| IsError           | 获取或设置数据是否错误           |
+| ErrorStr    | 获取或设置错误提示           |
+| TextType | 获取或设置文本类型       |
+| ShowClearButton | 获取或设置是否显示清除按钮       |
+
+# 方法
+
+| 方法             |   描述             |
+| ---------------- | ------------------ |
+| VerifyData()      | 验证数据 |
+
+# 事件
+
+| 事件             |   描述             |
+| ---------------- | ------------------ |
+| ValueChanged      | 在以某种方式更改 Value 属性后发生。 |

From d7169636804d82253026b9a07cabd68f8bcbe086 Mon Sep 17 00:00:00 2001
From: DinoChan <dino.chan@live.com>
Date: Sun, 19 Jan 2020 15:30:38 +0800
Subject: [PATCH 19/41] FIX SOMETHING

---
 doc/source/handycontrol/extend_controls/numericUpDown/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/source/handycontrol/extend_controls/numericUpDown/index.md b/doc/source/handycontrol/extend_controls/numericUpDown/index.md
index 0d5c0042..d2376e18 100644
--- a/doc/source/handycontrol/extend_controls/numericUpDown/index.md
+++ b/doc/source/handycontrol/extend_controls/numericUpDown/index.md
@@ -27,7 +27,7 @@ numericUpDown.Value = 100;
 
 # 设置DecimalPlaces
 
-如果需要改变Value显示的小数位数，可以改变DecimalPlaces。DecimalPlaces是一个**int？**类型，当它为null时不限制显示的小数位数，否则显示的小数位数为DecimalPlaces的Value。
+如果需要改变Value显示的小数位数，可以改变DecimalPlaces。DecimalPlaces是一个 **int？** 类型，当它为null时不限制显示的小数位数，否则显示的小数位数为DecimalPlaces的Value。
 
 ``` XML
 <hc:NumericUpDown DecimalPlaces="2" Value="100.12345"/>

From 1b051a6803b50222831ef7556ec8aec0cffdb1fa Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Mon, 20 Jan 2020 00:07:33 +0800
Subject: [PATCH 20/41] Update index.md

---
 .../native_controls/radioButton/index.md      | 22 +++++--------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/doc/source/handycontrol/native_controls/radioButton/index.md b/doc/source/handycontrol/native_controls/radioButton/index.md
index 8e2f6a68..0773732f 100644
--- a/doc/source/handycontrol/native_controls/radioButton/index.md
+++ b/doc/source/handycontrol/native_controls/radioButton/index.md
@@ -4,15 +4,9 @@ title: RadioButton 单选按钮
 
 # RadioButtonBaseStyle
 
-`RadioButton`基础样式，不建议直接使用，常作为其他样式基类样式
+单选按钮默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
 
-## 案例：
-
-```xml
-<Style BasedOn="{StaticResource RadioButtonBaseStyle}" TargetType="RadioButton"/>
-```
-
-`xaml`中：
+案例：
 
 ```xml
 <StackPanel>
@@ -31,7 +25,7 @@ title: RadioButton 单选按钮
 
 带图标样式，可只显示图标也可图文显示
 
-## 案例：
+案例：
 
 ```xml
 <UniformGrid Margin="22,0,0,0" Rows="2" Columns="2">
@@ -50,13 +44,7 @@ title: RadioButton 单选按钮
 
 `ButtonGroup`控件中的子集`RadioButton`样式基类，不建议直接使用，常作为`ButtonGroup`中`Item`样式基类,同时与`ButtonGroup`控件配套使用
 
-## 案例：
-
-```xml
-<Style x:Key="RadioGroupItemDefault" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton"/>
-```
-
-`xaml`中：
+案例：
 
 ```xml
 <!--内部Item样式为ButtonGroup控件自动附加-默认为水平方向item样式-->
@@ -89,7 +77,7 @@ title: RadioButton 单选按钮
 | RadioGroupItemVerticalFirst   | RadioGroupItem垂直头样式（从上至下） | RadioGroupItemBaseStyle |
 | RadioGroupItemVerticalLast    | RadioGroupItem垂直尾样式（从上至下） | RadioGroupItemBaseStyle |
 
-## 案例：
+案例：
 
 单个`RadioButton`样式：
 

From e4fa1db5530bf18572290d40bc0f3fc8bc0eeee5 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Mon, 20 Jan 2020 00:29:12 +0800
Subject: [PATCH 21/41] Update index.md

---
 doc/source/handycontrol/extend_controls/numericUpDown/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/source/handycontrol/extend_controls/numericUpDown/index.md b/doc/source/handycontrol/extend_controls/numericUpDown/index.md
index d2376e18..ad0773ae 100644
--- a/doc/source/handycontrol/extend_controls/numericUpDown/index.md
+++ b/doc/source/handycontrol/extend_controls/numericUpDown/index.md
@@ -1,5 +1,5 @@
 ---
-title: NumericUpDown
+title: NumericUpDown 数值选择控件
 ---
 
 NumericUpDown 控件看起来像一对用户可以单击来调整值的箭头按钮和TextBox的组合，该控件显示并设置数值(Value)。 用户可以通过单击向上和向下箭头，或通过在控件的TextBox部分中键入一个数字来改变Value。

From 5ac4c644d52bab4f50dad18978d01730095325d9 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 21 Jan 2020 00:13:20 +0800
Subject: [PATCH 22/41] fixed #314

---
 .../Styles/NativeProgressBarDemoCtl.xaml      | 20 ++++-
 .../Styles/Base/ProgressBarBaseStyle.xaml     | 73 ++++++++++++++++---
 .../Themes/Styles/ProgressBar.xaml            | 54 +++++++++++---
 3 files changed, 120 insertions(+), 27 deletions(-)

diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml
index 1cd461b3..aecf271e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml
@@ -11,7 +11,7 @@
                     <ProgressBar Style="{StaticResource ProgressBarSuccess}" Margin="0,0,0,10" Value="40"/>
                     <ProgressBar Style="{StaticResource ProgressBarInfo}" Margin="0,0,0,10" Value="60"/>
                     <ProgressBar Style="{StaticResource ProgressBarWarning}" Margin="0,0,0,10" Value="80"/>
-                    <ProgressBar Style="{StaticResource ProgressBarDanger}" Margin="0,0,0,10" Value="100" Maximum="200"/>
+                    <ProgressBar Style="{StaticResource ProgressBarDanger}" Margin="0,0,0,10" Value="100" Maximum="200" IsIndeterminate="True"/>
                 </StackPanel>
                 <StackPanel Margin="10,0,0,0" Width="200" HorizontalAlignment="Left">
                     <TextBlock Padding="0,2,0,3" Style="{StaticResource TextBlockDefault}" Text="ProgressbarPrimary" HorizontalAlignment="Left"/>
@@ -27,8 +27,8 @@
                     <ProgressBar Style="{StaticResource ProgressBarSuccessStripe}" Margin="0,0,0,10" Value="60" Maximum="200" />
                     <ProgressBar Style="{StaticResource ProgressBarInfoStripe}" Margin="0,0,0,10" Value="50" Maximum="200" />
                     <ProgressBar Style="{StaticResource ProgressBarWarningStripe}" Margin="0,0,0,10" Value="180" Maximum="200" />
-                    <ProgressBar Style="{StaticResource ProgressBarDangerStripe}" Margin="0,0,0,10" Value="110" Maximum="200" />
-                    <ProgressBar Style="{StaticResource ProgressBarFlat}" Margin="0,8,0,10" Value="110" Maximum="200" />
+                    <ProgressBar Style="{StaticResource ProgressBarDangerStripe}" Margin="0,0,0,10" IsIndeterminate="True" Maximum="200" />
+                    <ProgressBar Style="{StaticResource ProgressBarFlat}" Margin="0,8,0,10" Value="110" Maximum="200" IsIndeterminate="True"/>
                 </StackPanel>
                 <StackPanel Margin="10,0,0,0" Width="200" HorizontalAlignment="Left">
                     <TextBlock Padding="0,2,0,3" Style="{StaticResource TextBlockDefault}" Text="ProgressBarPrimaryStripe" HorizontalAlignment="Left"/>
@@ -39,6 +39,20 @@
                     <TextBlock Padding="0,12,0,3" Style="{StaticResource TextBlockDefault}" Text="ProgressBarPlayer" HorizontalAlignment="Left"/>
                 </StackPanel>
             </StackPanel>
+            <StackPanel Orientation="Horizontal" Height="200">
+                <ProgressBar Value="20" Margin="0,0,10,0" Orientation="Vertical" Width="20"/>
+                <ProgressBar Style="{StaticResource ProgressBarSuccess}" Margin="0,0,10,0" Value="40" Orientation="Vertical" Width="20"/>
+                <ProgressBar Style="{StaticResource ProgressBarInfo}" Margin="0,0,10,0" Value="60" Orientation="Vertical" Width="20"/>
+                <ProgressBar Style="{StaticResource ProgressBarWarning}" Margin="0,0,10,0" Value="80" Orientation="Vertical" Width="20"/>
+                <ProgressBar Style="{StaticResource ProgressBarDanger}" Margin="0,0,10,0" Value="100" Maximum="200" IsIndeterminate="True" Width="20" Orientation="Vertical"/>
+                
+                <ProgressBar Style="{StaticResource ProgressBarPrimaryStripe}" Margin="10,0,10,0" Value="120" Maximum="200" Orientation="Vertical" Width="20" />
+                <ProgressBar Style="{StaticResource ProgressBarSuccessStripe}" Margin="0,0,10,0" Value="60" Maximum="200" Orientation="Vertical" Width="20" />
+                <ProgressBar Style="{StaticResource ProgressBarInfoStripe}" Margin="0,0,10,0" Value="50" Maximum="200" Orientation="Vertical" Width="20" />
+                <ProgressBar Style="{StaticResource ProgressBarWarningStripe}" Margin="0,0,10,0" Value="180" Maximum="200" Orientation="Vertical" Width="20" />
+                <ProgressBar Style="{StaticResource ProgressBarDangerStripe}" Margin="0,0,10,0" IsIndeterminate="True" Maximum="200" Orientation="Vertical" Width="20"/>
+                <ProgressBar Style="{StaticResource ProgressBarFlat}" Margin="0,0,10,0" Value="110" Maximum="200" IsIndeterminate="True" Orientation="Vertical" Width="4"/>
+            </StackPanel>
         </WrapPanel>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml
index 214e7556..4e5ac058 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml
@@ -1,7 +1,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="clr-namespace:HandyControl.Controls"
-                    xmlns:shapes="clr-namespace:HandyControl.Expression.Shapes">
+                    xmlns:shapes="clr-namespace:HandyControl.Expression.Shapes"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../../Basic/Sizes.xaml"/>
@@ -33,18 +34,58 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ProgressBar">
-                    <controls:SimplePanel x:Name="TemplateRoot">
-                        <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"/>
-                        <Rectangle x:Name="PART_Track"/>
-                        <controls:SimplePanel HorizontalAlignment="Left">
-                            <Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
-                                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="Animation" ClipToBounds="true" Background="{TemplateBinding Foreground}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="IsIndeterminate" RepeatBehavior="Forever">
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="Animation">
+                                <EasingDoubleKeyFrame KeyTime="0" Value="0.25"/>
+                                <EasingDoubleKeyFrame KeyTime="0:0:1" Value="0.25"/>
+                                <EasingDoubleKeyFrame KeyTime="0:0:2" Value="0.25"/>
+                            </DoubleAnimationUsingKeyFrames>
+                            <PointAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransformOrigin)" Storyboard.TargetName="Animation">
+                                <EasingPointKeyFrame KeyTime="0" Value="-0.5,0.5"/>
+                                <EasingPointKeyFrame KeyTime="0:0:1" Value="0.5,0.5"/>
+                                <EasingPointKeyFrame KeyTime="0:0:2" Value="1.5,0.5"/>
+                            </PointAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <Border x:Name="TemplateRoot" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+                        <controls:SimplePanel>
+                            <Rectangle x:Name="PART_Track"/>
+                            <Border Style="{StaticResource BorderClip}" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="PART_Indicator" HorizontalAlignment="Left">
+                                <controls:SimplePanel>
+                                    <Border x:Name="Indicator" Background="{TemplateBinding Foreground}">
+                                        <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource TextIconBrush}" Text="{Binding Path=(controls:VisualElement.Text),RelativeSource={RelativeSource TemplatedParent}}"/>
+                                    </Border>
                                     <Rectangle x:Name="PART_GlowRect" Fill="{StaticResource ProgressBarIndicatorAnimatedFill}" HorizontalAlignment="Left" Margin="-100,0,0,0" Width="100"/>
-                                </Border>
-                            </Decorator>
-                            <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource TextIconBrush}" Text="{Binding Path=(controls:VisualElement.Text),RelativeSource={RelativeSource TemplatedParent}}"/>
+                                    <Rectangle x:Name="Animation" Visibility="Collapsed" Fill="{TemplateBinding Foreground}" RenderTransformOrigin="0.5,0.5">
+                                        <Rectangle.RenderTransform>
+                                            <TransformGroup>
+                                                <ScaleTransform/>
+                                            </TransformGroup>
+                                        </Rectangle.RenderTransform>
+                                    </Rectangle>
+                                </controls:SimplePanel>
+                            </Border>
                         </controls:SimplePanel>
-                    </controls:SimplePanel>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="Orientation" Value="Vertical">
+                            <Setter Property="Height" Value="{x:Static system:Double.NaN}"/>
+                            <Setter Property="LayoutTransform" TargetName="TemplateRoot">
+                                <Setter.Value>
+                                    <RotateTransform Angle="-90"/>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="IsIndeterminate" Value="true">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource IsIndeterminate}"/>
+                            </Trigger.EnterActions>
+                            <Setter Property="Visibility" TargetName="Indicator" Value="Collapsed"/>
+                            <Setter Property="Visibility" TargetName="PART_GlowRect" Value="Collapsed"/>
+                            <Setter Property="Visibility" TargetName="Animation" Value="Visible"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -70,11 +111,19 @@
                     <controls:SimplePanel x:Name="TemplateRoot" SnapsToDevicePixels="true">
                         <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"/>
                         <Rectangle x:Name="PART_Track"/>
-                        <Decorator x:Name="PART_Indicator" HorizontalAlignment="Left" Margin="1">
+                        <Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
                             <Border x:Name="Indicator" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Foreground}"/>
                         </Decorator>
                     </controls:SimplePanel>
                     <ControlTemplate.Triggers>
+                        <Trigger Property="Orientation" Value="Vertical">
+                            <Setter Property="Height" Value="{x:Static system:Double.NaN}"/>
+                            <Setter Property="LayoutTransform" TargetName="TemplateRoot">
+                                <Setter.Value>
+                                    <RotateTransform Angle="-90"/>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
                         <EventTrigger RoutedEvent="FrameworkElement.Loaded" SourceName="Indicator">
                             <BeginStoryboard Storyboard="{StaticResource OnLoaded}"/>
                         </EventTrigger>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/ProgressBar.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/ProgressBar.xaml
index dba2c685..cb21a15c 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/ProgressBar.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/ProgressBar.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="clr-namespace:HandyControl.Controls">
+                    xmlns:controls="clr-namespace:HandyControl.Controls"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Base/ProgressBarBaseStyle.xaml"/>
@@ -42,8 +43,8 @@
                                 <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
                                     <GradientStop Color="{DynamicResource DarkPrimaryColor}" Offset="0"/>
                                     <GradientStop Color="{DynamicResource DarkPrimaryColor}" Offset="0.5"/>
-                                    <GradientStop Color="White" Offset="0.5"/>
-                                    <GradientStop Color="White" Offset="1"/>
+                                    <GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5"/>
+                                    <GradientStop Color="{DynamicResource BackgroundColor}" Offset="1"/>
                                 </LinearGradientBrush>
                             </GeometryDrawing.Brush>
                             <GeometryDrawing.Geometry>
@@ -72,8 +73,8 @@
                                 <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
                                     <GradientStop Color="{DynamicResource DarkSuccessColor}" Offset="0"/>
                                     <GradientStop Color="{DynamicResource DarkSuccessColor}" Offset="0.5"/>
-                                    <GradientStop Color="White" Offset="0.5"/>
-                                    <GradientStop Color="White" Offset="1"/>
+                                    <GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5"/>
+                                    <GradientStop Color="{DynamicResource BackgroundColor}" Offset="1"/>
                                 </LinearGradientBrush>
                             </GeometryDrawing.Brush>
                             <GeometryDrawing.Geometry>
@@ -102,8 +103,8 @@
                                 <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
                                     <GradientStop Color="{DynamicResource DarkInfoColor}" Offset="0"/>
                                     <GradientStop Color="{DynamicResource DarkInfoColor}" Offset="0.5"/>
-                                    <GradientStop Color="White" Offset="0.5"/>
-                                    <GradientStop Color="White" Offset="1"/>
+                                    <GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5"/>
+                                    <GradientStop Color="{DynamicResource BackgroundColor}" Offset="1"/>
                                 </LinearGradientBrush>
                             </GeometryDrawing.Brush>
                             <GeometryDrawing.Geometry>
@@ -132,8 +133,8 @@
                                 <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
                                     <GradientStop Color="{DynamicResource DarkWarningColor}" Offset="0"/>
                                     <GradientStop Color="{DynamicResource DarkWarningColor}" Offset="0.5"/>
-                                    <GradientStop Color="White" Offset="0.5"/>
-                                    <GradientStop Color="White" Offset="1"/>
+                                    <GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5"/>
+                                    <GradientStop Color="{DynamicResource BackgroundColor}" Offset="1"/>
                                 </LinearGradientBrush>
                             </GeometryDrawing.Brush>
                             <GeometryDrawing.Geometry>
@@ -162,8 +163,8 @@
                                 <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
                                     <GradientStop Color="{DynamicResource DarkDangerColor}" Offset="0"/>
                                     <GradientStop Color="{DynamicResource DarkDangerColor}" Offset="0.5"/>
-                                    <GradientStop Color="White" Offset="0.5"/>
-                                    <GradientStop Color="White" Offset="1"/>
+                                    <GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5"/>
+                                    <GradientStop Color="{DynamicResource BackgroundColor}" Offset="1"/>
                                 </LinearGradientBrush>
                             </GeometryDrawing.Brush>
                             <GeometryDrawing.Geometry>
@@ -223,14 +224,43 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ProgressBar">
-                    <controls:SimplePanel x:Name="TemplateRoot" SnapsToDevicePixels="true">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="IsIndeterminate" RepeatBehavior="Forever">
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="Animation">
+                                <EasingDoubleKeyFrame KeyTime="0" Value="0.25"/>
+                                <EasingDoubleKeyFrame KeyTime="0:0:1" Value="0.25"/>
+                                <EasingDoubleKeyFrame KeyTime="0:0:2" Value="0.25"/>
+                            </DoubleAnimationUsingKeyFrames>
+                            <PointAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransformOrigin)" Storyboard.TargetName="Animation">
+                                <EasingPointKeyFrame KeyTime="0" Value="-0.5,0.5"/>
+                                <EasingPointKeyFrame KeyTime="0:0:1" Value="0.5,0.5"/>
+                                <EasingPointKeyFrame KeyTime="0:0:2" Value="1.5,0.5"/>
+                            </PointAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <controls:SimplePanel x:Name="TemplateRoot" SnapsToDevicePixels="true" ClipToBounds="True">
                         <Rectangle x:Name="PART_Track" Fill="{TemplateBinding Background}" StrokeThickness="0" Stroke="{TemplateBinding BorderBrush}"/>
                         <Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
                             <Rectangle x:Name="Indicator" Fill="{TemplateBinding Foreground}"/>
                         </Decorator>
+                        <Rectangle x:Name="Animation" Visibility="Collapsed" Fill="{TemplateBinding Foreground}" RenderTransformOrigin="0.5,0.5">
+                            <Rectangle.RenderTransform>
+                                <TransformGroup>
+                                    <ScaleTransform/>
+                                </TransformGroup>
+                            </Rectangle.RenderTransform>
+                        </Rectangle>
                     </controls:SimplePanel>
                     <ControlTemplate.Triggers>
+                        <Trigger Property="IsIndeterminate" Value="true">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource IsIndeterminate}"/>
+                            </Trigger.EnterActions>
+                            <Setter Property="Visibility" TargetName="Indicator" Value="Collapsed"/>
+                            <Setter Property="Visibility" TargetName="Animation" Value="Visible"/>
+                        </Trigger>
                         <Trigger Property="Orientation" Value="Vertical">
+                            <Setter Property="Height" Value="{x:Static system:Double.NaN}"/>
                             <Setter Property="LayoutTransform" TargetName="TemplateRoot">
                                 <Setter.Value>
                                     <RotateTransform Angle="-90"/>

From 3957a3b7bb6e93fe8f2ebc7732c959b73f751ca5 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 21 Jan 2020 23:10:58 +0800
Subject: [PATCH 23/41] fixed #313

---
 .../UserControl/Main/LeftMainContent.xaml                 | 2 +-
 .../HandyControl_Shared/Controls/Input/NumericUpDown.cs   | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
index efed5131..6776dbbc 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
@@ -24,7 +24,7 @@
         </Style>
     </Border.Resources>
     <DockPanel>
-        <Button Command="{Binding OpenOverviewCmd}" DockPanel.Dock="Top" HorizontalAlignment="Stretch" Margin="4,4,4,0" Content="{x:Static langs:Lang.Overview}"/>
+        <Button Command="{Binding OpenOverviewCmd}" DockPanel.Dock="Top" HorizontalAlignment="Stretch" Margin="4" Content="{x:Static langs:Lang.Overview}"/>
         <TabControl SelectionChanged="TabControl_OnSelectionChanged" ItemsSource="{Binding DemoInfoList}" Style="{StaticResource TabControlInLine}" Background="Transparent" SelectedIndex="0">
             <TabControl.ItemTemplate>
                 <DataTemplate>
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
index c18bbb0a..992adabf 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
@@ -196,13 +196,7 @@ namespace HandyControl.Controls
                 ctl.Value = maximum;
             }
 
-            var result = num > maximum ? maximum : num;
-            if (!ctl.DecimalPlaces.HasValue)
-            {
-                result = Math.Floor(result);
-            }
-
-            return result;
+            return num > maximum ? maximum : num;
         }
 
         /// <summary>

From e1a07c0accc02b632510277bdbaa7d8afea84240 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 21 Jan 2020 23:28:06 +0800
Subject: [PATCH 24/41] modified some styles

---
 src/Core_30/HandyControl_Core_30/Themes/Styles/MessageBox.xaml  | 2 +-
 src/Net_40/HandyControl_Net_40/Themes/Styles/MessageBox.xaml    | 2 +-
 .../HandyControl_Net_GE45/Themes/Styles/MessageBox.xaml         | 2 +-
 .../Window/CustomNonClientAreaWindow.xaml                       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Core_30/HandyControl_Core_30/Themes/Styles/MessageBox.xaml b/src/Core_30/HandyControl_Core_30/Themes/Styles/MessageBox.xaml
index 0cd58286..6eae7d67 100644
--- a/src/Core_30/HandyControl_Core_30/Themes/Styles/MessageBox.xaml
+++ b/src/Core_30/HandyControl_Core_30/Themes/Styles/MessageBox.xaml
@@ -73,7 +73,7 @@
                                 <ScrollViewer Grid.Column="1" Grid.Row="0">
                                     <TextBlock Margin="10,39,10,10" Text="{TemplateBinding Message}" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Top"/>
                                 </ScrollViewer>
-                                <StackPanel Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center">
+                                <StackPanel Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center">
                                     <Button Visibility="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" IsCancel="True" MinWidth="88" Command="interactivity:ControlCommands.Cancel" Content="{x:Static langs:Lang.Cancel}" Margin="5,0"/>
                                     <Button Visibility="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" IsDefault="True" MinWidth="88" Command="interactivity:ControlCommands.Confirm" Content="{x:Static langs:Lang.Confirm}" Margin="5,0" Style="{StaticResource ButtonPrimary}"/>
                                     <Button Visibility="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" IsCancel="True" MinWidth="88" Command="interactivity:ControlCommands.No" Content="{x:Static langs:Lang.No}" Margin="5,0"/>
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/MessageBox.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/MessageBox.xaml
index 7c7789d7..8af1741b 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/MessageBox.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/MessageBox.xaml
@@ -74,7 +74,7 @@
                                 <ScrollViewer Grid.Column="1" Grid.Row="0">
                                     <TextBlock Margin="10,39,10,10" Text="{TemplateBinding Message}" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Top"/>
                                 </ScrollViewer>
-                                <StackPanel Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center">
+                                <StackPanel Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center">
                                     <Button Visibility="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" IsCancel="True" MinWidth="88" Command="interactivity:ControlCommands.Cancel" Content="{x:Static langs:Lang.Cancel}" Margin="5,0"/>
                                     <Button Visibility="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" IsDefault="True" MinWidth="88" Command="interactivity:ControlCommands.Confirm" Content="{x:Static langs:Lang.Confirm}" Margin="5,0" Style="{StaticResource ButtonPrimary}"/>
                                     <Button Visibility="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" IsCancel="True" MinWidth="88" Command="interactivity:ControlCommands.No" Content="{x:Static langs:Lang.No}" Margin="5,0"/>
diff --git a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/MessageBox.xaml b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/MessageBox.xaml
index 0cd58286..6eae7d67 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/MessageBox.xaml
+++ b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/MessageBox.xaml
@@ -73,7 +73,7 @@
                                 <ScrollViewer Grid.Column="1" Grid.Row="0">
                                     <TextBlock Margin="10,39,10,10" Text="{TemplateBinding Message}" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Top"/>
                                 </ScrollViewer>
-                                <StackPanel Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center">
+                                <StackPanel Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center">
                                     <Button Visibility="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" IsCancel="True" MinWidth="88" Command="interactivity:ControlCommands.Cancel" Content="{x:Static langs:Lang.Cancel}" Margin="5,0"/>
                                     <Button Visibility="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" IsDefault="True" MinWidth="88" Command="interactivity:ControlCommands.Confirm" Content="{x:Static langs:Lang.Confirm}" Margin="5,0" Style="{StaticResource ButtonPrimary}"/>
                                     <Button Visibility="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" IsCancel="True" MinWidth="88" Command="interactivity:ControlCommands.No" Content="{x:Static langs:Lang.No}" Margin="5,0"/>
diff --git a/src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml
index 8cfc0d4c..7dc14330 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml
@@ -9,7 +9,7 @@
            OtherButtonForeground="{DynamicResource ReverseTextBrush}"
            CloseButtonForeground="{DynamicResource ReverseTextBrush}"
            NonClientAreaBackground="{DynamicResource ToolBarBackground}"
-           NonClientAreaHeight="69"
+           NonClientAreaHeight="62"
            Background="{DynamicResource MainContentBackgroundBrush}"
            WindowStartupLocation="CenterScreen"
            ShowTitle="False"

From 78ca0f165c4791efb04e713e38d36b0acd8d6754 Mon Sep 17 00:00:00 2001
From: guanguanchuangyu <3246907890@qq.com>
Date: Tue, 28 Jan 2020 20:18:04 +0800
Subject: [PATCH 25/41] add native_control doc of RichTextBox

RichTextBox
---
 .../native_controls/richTextBox/index.md      | 41 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/doc/source/handycontrol/native_controls/richTextBox/index.md b/doc/source/handycontrol/native_controls/richTextBox/index.md
index ca12ad62..6e8e2621 100644
--- a/doc/source/handycontrol/native_controls/richTextBox/index.md
+++ b/doc/source/handycontrol/native_controls/richTextBox/index.md
@@ -1,5 +1,42 @@
 ---
-title: 建设中
+title: RichTextBox 富文本框
 ---
 
-建设中
\ No newline at end of file
+# TextBoxBaseBaseStyle
+
+该样式属于文本框基础样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+案例：
+
+```xml
+<Style x:Key="RichTextBoxBaseStyle" BasedOn="{StaticResource TextBoxBaseBaseStyle}" TargetType="RichTextBox">
+   <Setter Property="MinWidth" Value="10"/>
+</Style>
+```
+
+# RichTextBoxBaseStyle:TextBoxBaseBaseStyle
+
+富文本框的基础样式，作为默认富文本框的基类样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用
+
+案例：
+
+```xml
+<Style BasedOn="{StaticResource RichTextBoxBaseStyle}" TargetType="RichTextBox"/>
+```
+
+`xaml`中：
+
+```xml
+<RichTextBox Margin="10,10" VerticalAlignment="Center" HorizontalAlignment="Center"></RichTextBox>
+```
+
+
+
+效果：
+
+![RichTextbox.DefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RichTextbox.DefaultStyle.png)
+
+
+
+
+

From 55e98264cd9bb3c32ea0a29f519a05b3598aed6c Mon Sep 17 00:00:00 2001
From: guanguanchuangyu <3246907890@qq.com>
Date: Tue, 28 Jan 2020 20:18:49 +0800
Subject: [PATCH 26/41] add native_control doc of ScrollViewer

ScrollViewer
---
 .../native_controls/scrollViewer/index.md     | 47 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/doc/source/handycontrol/native_controls/scrollViewer/index.md b/doc/source/handycontrol/native_controls/scrollViewer/index.md
index ca12ad62..c7223b6d 100644
--- a/doc/source/handycontrol/native_controls/scrollViewer/index.md
+++ b/doc/source/handycontrol/native_controls/scrollViewer/index.md
@@ -1,5 +1,48 @@
 ---
-title: 建设中
+title: ScrollViewer 滚动视图
 ---
 
-建设中
\ No newline at end of file
+# ScrollViewerNativeBaseStyle
+
+滚动视图的基础样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+案例：
+
+```xml
+<Style BasedOn="{StaticResource ScrollViewerNativeBaseStyle}" TargetType="ScrollViewer"/>
+```
+
+`xaml`中：
+
+```xml
+<ScrollViewer>
+   <Grid Height="500">
+      <TextBlock Text="内容区域"></TextBlock>
+   </Grid>
+</ScrollViewer>
+```
+
+效果：
+
+![ScrollViewer.DefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ScrollViewer.DefaultStyle.png)
+
+# ScrollViewerUpDown
+
+显示上下按钮的滚动视图样式
+
+案例：
+
+```xml
+<ScrollViewer Style="{DynamicResource ScrollViewerUpDown}">
+    <StackPanel Height="500">
+        <TextBlock Text="内容区域" Height="250"></TextBlock>
+        <TextBlock Text="内容区域" Height="250"></TextBlock>
+        <TextBlock Text="内容区域"></TextBlock>
+        <TextBlock Text="内容区域"></TextBlock>
+    </StackPanel>
+</ScrollViewer>
+```
+
+效果：
+
+![ScrollViewer.UpDownStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ScrollViewer.UpDownStyle.png)
\ No newline at end of file

From 28dec866667bd4a7308a581252255ed84c17474a Mon Sep 17 00:00:00 2001
From: guanguanchuangyu <3246907890@qq.com>
Date: Tue, 28 Jan 2020 20:19:18 +0800
Subject: [PATCH 27/41] add native_control doc of Slider

Slider
---
 .../native_controls/slider/index.md           | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/doc/source/handycontrol/native_controls/slider/index.md b/doc/source/handycontrol/native_controls/slider/index.md
index ca12ad62..db0474b3 100644
--- a/doc/source/handycontrol/native_controls/slider/index.md
+++ b/doc/source/handycontrol/native_controls/slider/index.md
@@ -1,5 +1,20 @@
 ---
-title: 建设中
+title: Slider 滑块
 ---
 
-建设中
\ No newline at end of file
+# SliderBaseStyle
+
+滑块基础样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+案例：
+
+```xml
+<UniformGrid.Resources>
+    <Style BasedOn="{StaticResource SliderBaseStyle}" TargetType="Slider"/>
+</UniformGrid.Resources>
+<Slider Margin="10,30"></Slider>
+```
+
+效果：
+
+![Slider.DefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/Slider.DefaultStyle.png)
\ No newline at end of file

From 8da45a30fc42b1b3df2fb29b085fd546b8596bb7 Mon Sep 17 00:00:00 2001
From: guanguanchuangyu <3246907890@qq.com>
Date: Tue, 28 Jan 2020 20:19:45 +0800
Subject: [PATCH 28/41] add native_control doc of TabControl

TabControl
---
 .../native_controls/tabControl/index.md       | 96 ++++++++++++++++++-
 1 file changed, 94 insertions(+), 2 deletions(-)

diff --git a/doc/source/handycontrol/native_controls/tabControl/index.md b/doc/source/handycontrol/native_controls/tabControl/index.md
index ca12ad62..0f8c5440 100644
--- a/doc/source/handycontrol/native_controls/tabControl/index.md
+++ b/doc/source/handycontrol/native_controls/tabControl/index.md
@@ -1,5 +1,97 @@
 ---
-title: 建设中
+title: TabControl 选项卡控件
 ---
 
-建设中
\ No newline at end of file
+# TabControlBaseStyle
+
+选项卡控件默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用
+
+案例：
+
+```xml
+<Style BasedOn="{StaticResource TabControlBaseStyle}" TargetType="TabControl"/>
+```
+
+`xaml`中：
+
+ ```xml
+<TabControl Margin="10">
+    <TabItem Header="选项卡1">
+    </TabItem>
+    <TabItem Header="选项卡2">
+    </TabItem>
+    <TabItem Header="选项卡3">
+    </TabItem>
+</TabControl>
+ ```
+
+效果：
+
+![TabControl.DefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TabControl.DefaultStyle.png)
+
+# TabControlInLine
+
+行内选中选项卡样式
+
+案例：
+
+```xml
+<TabControl Margin="10" Style="{DynamicResource TabControlInLine}">
+    <TabItem Header="选项卡1">
+    </TabItem>
+    <TabItem Header="选项卡2">
+    </TabItem>
+    <TabItem Header="选项卡3">
+    </TabItem>
+</TabControl>
+```
+
+效果：
+
+![TabControl.InLineStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TabControl.InLineStyle.png)
+
+# TabControlCapsule
+
+简约选项卡样式
+
+案例：
+
+```xml
+<TabControl Margin="10" Style="{DynamicResource TabControlCapsule}">
+    <TabItem Header="选项卡1">
+    </TabItem>
+    <TabItem Header="选项卡2">
+    </TabItem>
+    <TabItem Header="选项卡3">
+    </TabItem>
+</TabControl>
+```
+
+效果：
+
+![TabControl.CapsuleStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TabControl.CapsuleStyle.png)
+
+# TabControlCapsuleSolid
+
+案例：
+
+```xml
+<TabControl Margin="10" Style="{DynamicResource TabControlCapsuleSolid}">
+    <TabItem Header="选项卡1">
+    </TabItem>
+    <TabItem Header="选项卡2">
+    </TabItem>
+    <TabItem Header="选项卡3">
+    </TabItem>
+</TabControl>
+```
+
+效果：
+
+![TabControl.CapsuleSolidStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TabControl.CapsuleSolidStyle.png)
+
+# 温馨提示
+
+使用属性`TabStripPlacement`设定头部标题的位置，效果如下：
+
+![TabControl.TabStripPlacement](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TabControl.TabStripPlacement.png)
\ No newline at end of file

From e9a7123398710eec6fca94788481d0d38a25b48a Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 2 Feb 2020 14:37:39 +0800
Subject: [PATCH 29/41] optimized performance

---
 .../HandyControlDemo_Shared/App.xaml.cs       |  1 +
 .../Resources/Themes/Basic/Brushes.xaml       | 89 ++++++++++---------
 .../Resources/Themes/Basic/Geometries.xaml    | 55 ++++++------
 .../Resources/Themes/Styles/Style.xaml        |  4 +
 .../UserControl/Controls/PoptipDemoCtl.xaml   |  4 +-
 .../UserControl/Main/LeftMainContent.xaml     |  4 +-
 .../Controls/Window/GlowWindow.cs             | 61 +++++++------
 .../Data/GlowWindow/GlowBitmap.cs             |  1 +
 .../Data/HandyControlConfig.cs                |  2 +
 .../Themes/Basic/Brushes.xaml                 | 83 ++++++++---------
 .../Themes/Basic/Effects.xaml                 | 12 +--
 .../Themes/Basic/Geometries.xaml              | 81 ++++++++---------
 .../Themes/Styles/Image.xaml                  |  2 +-
 .../Tools/Helper/ConfigHelper.cs              |  5 ++
 .../Tools/Helper/WindowHelper.cs              |  2 +
 .../Tools/Interop/InteropValues.cs            | 23 ++++-
 16 files changed, 239 insertions(+), 190 deletions(-)

diff --git a/src/Shared/HandyControlDemo_Shared/App.xaml.cs b/src/Shared/HandyControlDemo_Shared/App.xaml.cs
index 5bdcc810..72e70341 100644
--- a/src/Shared/HandyControlDemo_Shared/App.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/App.xaml.cs
@@ -6,6 +6,7 @@ using System.Net;
 using System.Security.Authentication; 
 using System.Threading;
 using System.Windows;
+using System.Windows.Media.Animation;
 using HandyControl.Data;
 using HandyControl.Tools;
 using HandyControlDemo.Data;
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Brushes.xaml b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Brushes.xaml
index 59291a58..bcee168f 100644
--- a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Brushes.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Brushes.xaml
@@ -1,18 +1,19 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:o="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Geometries.xaml"/>
     </ResourceDictionary.MergedDictionaries>
     
-    <DrawingBrush x:Key="MainContentForegroundDrawingBrush" RenderOptions.CachingHint="Cache" Viewport="0,0,16,16" ViewportUnits="Absolute" Stretch="None" TileMode="Tile">
+    <DrawingBrush o:Freeze="True" x:Key="MainContentForegroundDrawingBrush" RenderOptions.CachingHint="Cache" Viewport="0,0,16,16" ViewportUnits="Absolute" Stretch="None" TileMode="Tile">
         <DrawingBrush.Drawing>
-            <DrawingGroup>
-                <GeometryDrawing Brush="{DynamicResource MainContentForegroundBrush}">
+            <DrawingGroup o:Freeze="True">
+                <GeometryDrawing o:Freeze="True" Brush="{DynamicResource MainContentForegroundBrush}">
                     <GeometryDrawing.Geometry>
-                        <GeometryGroup>
-                            <RectangleGeometry Rect="0,0,8,8" />
-                            <RectangleGeometry Rect="8,8,8,8" />
+                        <GeometryGroup o:Freeze="True">
+                            <RectangleGeometry o:Freeze="True" Rect="0,0,8,8" />
+                            <RectangleGeometry o:Freeze="True" Rect="8,8,8,8" />
                         </GeometryGroup>
                     </GeometryDrawing.Geometry>
                 </GeometryDrawing>
@@ -20,45 +21,45 @@
         </DrawingBrush.Drawing>
     </DrawingBrush>
 
-    <DrawingBrush x:Key="GitHubDrawingBrush" RenderOptions.CachingHint="Cache" Viewport="0,0,200,100" ViewportUnits="Absolute" Stretch="Uniform" TileMode="Tile">
+    <DrawingBrush o:Freeze="True" x:Key="GitHubDrawingBrush" RenderOptions.CachingHint="Cache" Viewport="0,0,200,100" ViewportUnits="Absolute" Stretch="Uniform" TileMode="Tile">
         <DrawingBrush.Transform>
-            <TransformGroup>
-                <RotateTransform Angle="20"/>
+            <TransformGroup o:Freeze="True">
+                <RotateTransform o:Freeze="True" Angle="20"/>
             </TransformGroup>
         </DrawingBrush.Transform>
         <DrawingBrush.Drawing>
-            <DrawingGroup>
-                <GeometryDrawing Brush="{DynamicResource DarkMaskBrush}" Geometry="{StaticResource GitHubStrGeometry}"/>
+            <DrawingGroup o:Freeze="True">
+                <GeometryDrawing o:Freeze="True" Brush="{DynamicResource DarkMaskBrush}" Geometry="{StaticResource GitHubStrGeometry}"/>
             </DrawingGroup>
         </DrawingBrush.Drawing>
     </DrawingBrush>
 
-    <DrawingBrush x:Key="QqDrawingBrush" RenderOptions.CachingHint="Cache" Viewport="0,0,100,200" ViewportUnits="Absolute" Stretch="Uniform" TileMode="Tile">
+    <DrawingBrush o:Freeze="True" x:Key="QqDrawingBrush" RenderOptions.CachingHint="Cache" Viewport="0,0,100,200" ViewportUnits="Absolute" Stretch="Uniform" TileMode="Tile">
         <DrawingBrush.Transform>
-            <TransformGroup>
-                <RotateTransform Angle="20"/>
+            <TransformGroup o:Freeze="True">
+                <RotateTransform o:Freeze="True" Angle="20"/>
             </TransformGroup>
         </DrawingBrush.Transform>
         <DrawingBrush.Drawing>
-            <DrawingGroup>
-                <GeometryDrawing Brush="{DynamicResource DarkMaskBrush}" Geometry="{StaticResource QqGeometry}"/>
+            <DrawingGroup o:Freeze="True">
+                <GeometryDrawing o:Freeze="True" Brush="{DynamicResource DarkMaskBrush}" Geometry="{StaticResource QqGeometry}"/>
             </DrawingGroup>
         </DrawingBrush.Drawing>
     </DrawingBrush>
 
-    <DrawingBrush x:Key="BlogDrawingBrush" RenderOptions.CachingHint="Cache" Viewport="0,0,160,100" ViewportUnits="Absolute" Stretch="Uniform" TileMode="Tile">
+    <DrawingBrush o:Freeze="True" x:Key="BlogDrawingBrush" RenderOptions.CachingHint="Cache" Viewport="0,0,160,100" ViewportUnits="Absolute" Stretch="Uniform" TileMode="Tile">
         <DrawingBrush.Transform>
-            <TransformGroup>
-                <RotateTransform Angle="20"/>
+            <TransformGroup o:Freeze="True">
+                <RotateTransform o:Freeze="True" Angle="20"/>
             </TransformGroup>
         </DrawingBrush.Transform>
         <DrawingBrush.Drawing>
-            <GeometryDrawing>
+            <GeometryDrawing o:Freeze="True">
                 <GeometryDrawing.Geometry>
-                    <RectangleGeometry Rect="0,0,160,100"></RectangleGeometry>
+                    <RectangleGeometry o:Freeze="True" Rect="0,0,160,100"></RectangleGeometry>
                 </GeometryDrawing.Geometry>
                 <GeometryDrawing.Brush>
-                    <VisualBrush>
+                    <VisualBrush o:Freeze="True">
                         <VisualBrush.Visual>
                             <StackPanel>
                                 <TextBlock Text="Blog" Foreground="{DynamicResource DarkMaskBrush}"/>
@@ -70,19 +71,19 @@
         </DrawingBrush.Drawing>
     </DrawingBrush>
 
-    <DrawingBrush x:Key="WebsiteDrawingBrush" RenderOptions.CachingHint="Cache" Viewport="0,0,320,100" ViewportUnits="Absolute" Stretch="Uniform" TileMode="Tile">
+    <DrawingBrush o:Freeze="True" x:Key="WebsiteDrawingBrush" RenderOptions.CachingHint="Cache" Viewport="0,0,320,100" ViewportUnits="Absolute" Stretch="Uniform" TileMode="Tile">
         <DrawingBrush.Transform>
-            <TransformGroup>
-                <RotateTransform Angle="20"/>
+            <TransformGroup o:Freeze="True">
+                <RotateTransform o:Freeze="True" Angle="20"/>
             </TransformGroup>
         </DrawingBrush.Transform>
         <DrawingBrush.Drawing>
-            <GeometryDrawing>
+            <GeometryDrawing o:Freeze="True">
                 <GeometryDrawing.Geometry>
-                    <RectangleGeometry Rect="0,0,320,100"></RectangleGeometry>
+                    <RectangleGeometry o:Freeze="True" Rect="0,0,320,100"></RectangleGeometry>
                 </GeometryDrawing.Geometry>
                 <GeometryDrawing.Brush>
-                    <VisualBrush>
+                    <VisualBrush o:Freeze="True">
                         <VisualBrush.Visual>
                             <StackPanel>
                                 <TextBlock Text="Website" Foreground="{DynamicResource DarkMaskBrush}"/>
@@ -94,19 +95,19 @@
         </DrawingBrush.Drawing>
     </DrawingBrush>
 
-    <DrawingBrush x:Key="ProjectDrawingBrush" RenderOptions.CachingHint="Cache" Viewport="0,0,240,100" ViewportUnits="Absolute" Stretch="Uniform" TileMode="Tile">
+    <DrawingBrush o:Freeze="True" x:Key="ProjectDrawingBrush" RenderOptions.CachingHint="Cache" Viewport="0,0,240,100" ViewportUnits="Absolute" Stretch="Uniform" TileMode="Tile">
         <DrawingBrush.Transform>
-            <TransformGroup>
-                <RotateTransform Angle="20"/>
+            <TransformGroup o:Freeze="True">
+                <RotateTransform o:Freeze="True" Angle="20"/>
             </TransformGroup>
         </DrawingBrush.Transform>
         <DrawingBrush.Drawing>
-            <GeometryDrawing>
+            <GeometryDrawing o:Freeze="True">
                 <GeometryDrawing.Geometry>
-                    <RectangleGeometry Rect="0,0,240,100"></RectangleGeometry>
+                    <RectangleGeometry o:Freeze="True" Rect="0,0,240,100"></RectangleGeometry>
                 </GeometryDrawing.Geometry>
                 <GeometryDrawing.Brush>
-                    <VisualBrush>
+                    <VisualBrush o:Freeze="True">
                         <VisualBrush.Visual>
                             <StackPanel>
                                 <TextBlock Text="Project" Foreground="{DynamicResource DarkMaskBrush}"/>
@@ -118,18 +119,18 @@
         </DrawingBrush.Drawing>
     </DrawingBrush>
 
-    <LinearGradientBrush x:Key="MenuButtonBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="White" Offset="0"/>
-        <GradientStop Color="#F2F2F2" Offset="1"/>
+    <LinearGradientBrush o:Freeze="True" x:Key="MenuButtonBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+        <GradientStop o:Freeze="True" Color="White" Offset="0"/>
+        <GradientStop o:Freeze="True" Color="#F2F2F2" Offset="1"/>
     </LinearGradientBrush>
 
-    <LinearGradientBrush x:Key="ToolBarBackground" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#F5F4F5" Offset="0"/>
-        <GradientStop Color="#D1CFD1" Offset="1"/>
+    <LinearGradientBrush o:Freeze="True" x:Key="ToolBarBackground" EndPoint="0.5,1" StartPoint="0.5,0">
+        <GradientStop o:Freeze="True" Color="#F5F4F5" Offset="0"/>
+        <GradientStop o:Freeze="True" Color="#D1CFD1" Offset="1"/>
     </LinearGradientBrush>
 
-    <SolidColorBrush x:Key="MainBackgroundBrush" Color="{DynamicResource MainBackgroundColor}"/>
-    <SolidColorBrush x:Key="MainContentForegroundBrush" Color="{DynamicResource MainContentForegroundColor}"/>
-    <SolidColorBrush x:Key="MainContentBackgroundBrush" Color="{DynamicResource MainContentBackgroundColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="MainBackgroundBrush" Color="{DynamicResource MainBackgroundColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="MainContentForegroundBrush" Color="{DynamicResource MainContentForegroundColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="MainContentBackgroundBrush" Color="{DynamicResource MainContentBackgroundColor}"/>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Geometries.xaml b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Geometries.xaml
index a894a9c6..b60dd6db 100644
--- a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Geometries.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Geometries.xaml
@@ -1,31 +1,32 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:o="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
 
-    <Geometry x:Key="NewGeometry">M512 0h1216a512 512 0 1 1 0 1024H512A512 512 0 1 1 512 0zM420.16 311.04V768h74.88V433.92h2.56l228.48 334.08h72.96V311.04h-75.52v329.6h-2.56l-225.92-329.6h-74.88z m468.48 0V768h340.48v-64h-265.6V565.76h239.36v-64h-239.36V375.04h254.72v-64h-329.6z m369.28 0l131.2 456.96h80l89.6-343.68h2.56l88.96 343.68h79.36l131.84-456.96h-84.48l-85.76 347.52h-2.56l-90.24-347.52h-77.44l-90.24 347.52h-2.56l-85.76-347.52h-84.48z</Geometry>
-    <Geometry x:Key="LogoGeometry">M40.493382,19.001303 C36.637875,19.06448 33.938568,21.421986 33.948524,25.271919 L34.068279,71.56765 34.066906,71.598007 34.068745,71.747833 34.18895,118.21758 C34.202225,123.35083 39.026951,129.19344 44.965271,131.2674 50.903587,133.34137 55.706783,130.86133 55.693504,125.72808 L55.589508,85.524513 93.866371,85.524513 93.950943,118.21758 C93.964218,123.35083 98.788948,129.19344 104.72726,131.2674 110.66558,133.34137 115.46878,130.86133 115.4555,125.72808 L115.33575,79.432381 115.33712,79.401993 115.33528,79.252007 115.21507,32.782413 C115.2018,27.64917 110.37708,21.806566 104.43876,19.732603 98.500435,17.658638 93.697243,20.138674 93.710518,25.271919 L93.814514,65.475487 55.537647,65.475487 55.453079,32.782413 C55.439804,27.64917 50.615082,21.806566 44.676762,19.732603 43.192181,19.214111 41.778549,18.980244 40.493382,19.001303 z M9.999999,0 L140,0 C145.52284,0 150,4.4771523 150,9.999999 L150,140 C150,145.52284 145.52284,150 140,150 L9.999999,150 C4.4771523,150 0,145.52284 0,140 L0,9.999999 C0,4.4771523 4.4771523,0 9.999999,0 z</Geometry>
-    <Geometry x:Key="CirclePanelDemoGeometry">M28.677037,-2.2499313E-22 C38.75065,24.740243 38.50705,52.437974 27.999852,77.000001 L-1.7053028E-13,65.206651 C7.3550318,48.013234 7.5255431,28.624822 0.4740567,11.306663 z</Geometry>
-    <Geometry x:Key="CirclePanelRightGeometry">M267.287478 892.162257c0 45.149912 59.597884 71.336861 93.008818 37.925926L740.458554 549.925926c21.671958-21.671958 21.671958-54.179894 0-75.851852L360.296296 93.911817c-33.410935-33.410935-93.008818-5.417989-93.008818 38.828924v759.421516z m0 0</Geometry>
-    <Geometry x:Key="GithubGeometry">M512 0C229.12 0 0 229.12 0 512c0 226.56 146.56 417.92 350.08 485.76 25.6 4.48 35.2-10.88 35.2-24.32 0-12.16-0.64-52.48-0.64-95.36-128.64 23.68-161.92-31.36-172.16-60.16-5.76-14.72-30.72-60.16-52.48-72.32-17.92-9.6-43.52-33.28-0.64-33.92 40.32-0.64 69.12 37.12 78.72 52.48 46.08 77.44 119.68 55.68 149.12 42.24 4.48-33.28 17.92-55.68 32.64-68.48-113.92-12.8-232.96-56.96-232.96-252.8 0-55.68 19.84-101.76 52.48-137.6-5.12-12.8-23.04-65.28 5.12-135.68 0 0 42.88-13.44 140.8 52.48 40.96-11.52 84.48-17.28 128-17.28 43.52 0 87.04 5.76 128 17.28 97.92-66.56 140.8-52.48 140.8-52.48 28.16 70.4 10.24 122.88 5.12 135.68 32.64 35.84 52.48 81.28 52.48 137.6 0 196.48-119.68 240-233.6 252.8 18.56 16 34.56 46.72 34.56 94.72 0 68.48-0.64 123.52-0.64 140.8 0 13.44 9.6 29.44 35.2 24.32A512.832 512.832 0 0 0 1024 512c0-282.88-229.12-512-512-512z</Geometry>
-    <Geometry x:Key="NugetGeometry">M449.722947 199.412211H706.021053c130.967579 0 237.136842 106.169263 237.136842 237.136842v256.298105c0 130.967579-106.169263 237.136842-237.136842 237.136842H449.722947c-130.965895 0-237.136842-106.169263-237.136842-237.136842V436.549053c0-130.967579 106.170947-237.136842 237.136842-237.136842z m-201.205894-21.557895c0-64.299789-70.085053-104.704-125.850948-72.55579s-55.764211 112.96 0 145.111579 125.850947-8.257684 125.850948-72.555789z m239.528421 234.74021c0-68.003368-74.088421-110.736842-133.037474-76.734315s-58.950737 119.467789 0 153.470315 133.039158-8.730947 133.039158-76.736zM835.368421 692.847158c0-117.596632-128.154947-191.494737-230.123789-132.695579s-101.970526 206.593684 0 265.391158S835.368421 810.443789 835.368421 692.847158z</Geometry>
-    <Geometry x:Key="EmailGeometry">M430.079734 481.464543c45.196365 45.596478 118.486578 45.596478 163.68499 0l360.684736-324.939627c0.547469 3.751441 1.13894 7.490601 1.13894 11.401678l0 404.753417 0 116.754121c0 42.995233-34.547841 77.838809-77.145008 77.838809L145.397996 767.272941c-42.597167 0-77.145008-34.844599-77.145008-77.838809L68.252988 494.839155 68.252988 167.926594c0-3.911076 0.593518-7.65126 1.139963-11.401678L430.079734 481.464543zM910.960992 74.226538 562.044278 387.28558c-38.470173 38.811957-62.276369 38.811957-100.770078 0L112.538611 74.408687c10.011005-4.789073 21.069875-7.673773 32.859385-7.673773l733.044372 0C890.095779 66.735937 901.065622 69.539796 910.960992 74.226538z</Geometry>
-    <Geometry x:Key="GitterGeometry">M260.8 645H160V0h100.8v645zM461.8 152.2h-100.8V1024h100.8V152.2z m201.2 0h-100.8V1024h100.8V152.2zM864 152h-100.8v494H864V152z</Geometry>
-    <Geometry x:Key="WebsiteGeometry">M698.026667 597.333333C701.44 569.173333 704 541.013333 704 512 704 482.986667 701.44 454.826667 698.026667 426.666667L842.24 426.666667C849.066667 453.973333 853.333333 482.56 853.333333 512 853.333333 541.44 849.066667 570.026667 842.24 597.333333M622.506667 834.56C648.106667 787.2 667.733333 736 681.386667 682.666667L807.253333 682.666667C766.293333 753.066667 701.013333 807.68 622.506667 834.56M611.84 597.333333 412.16 597.333333C407.893333 569.173333 405.333333 541.013333 405.333333 512 405.333333 482.986667 407.893333 454.4 412.16 426.666667L611.84 426.666667C615.68 454.4 618.666667 482.986667 618.666667 512 618.666667 541.013333 615.68 569.173333 611.84 597.333333M512 851.626667C476.586667 800.426667 448 743.68 430.506667 682.666667L593.493333 682.666667C576 743.68 547.413333 800.426667 512 851.626667M341.333333 341.333333 216.746667 341.333333C257.28 270.506667 322.986667 215.893333 401.066667 189.44 375.466667 236.8 356.266667 288 341.333333 341.333333M216.746667 682.666667 341.333333 682.666667C356.266667 736 375.466667 787.2 401.066667 834.56 322.986667 807.68 257.28 753.066667 216.746667 682.666667M181.76 597.333333C174.933333 570.026667 170.666667 541.44 170.666667 512 170.666667 482.56 174.933333 453.973333 181.76 426.666667L325.973333 426.666667C322.56 454.826667 320 482.986667 320 512 320 541.013333 322.56 569.173333 325.973333 597.333333M512 171.946667C547.413333 223.146667 576 280.32 593.493333 341.333333L430.506667 341.333333C448 280.32 476.586667 223.146667 512 171.946667M807.253333 341.333333 681.386667 341.333333C667.733333 288 648.106667 236.8 622.506667 189.44 701.013333 216.32 766.293333 270.506667 807.253333 341.333333M512 85.333333C276.053333 85.333333 85.333333 277.333333 85.333333 512 85.333333 747.52 276.48 938.666667 512 938.666667 747.52 938.666667 938.666667 747.52 938.666667 512 938.666667 276.48 747.52 85.333333 512 85.333333Z</Geometry>
-    <Geometry x:Key="FaceBookGeometry">m 41.416254,90 c -0.327378,-7.4702 0.20833,-32.7284 0,-39.901 -5.386902,-0.2083 -4.521603,0.3274 -9.848987,0 0.20833,-5.50595 0.36436,-7.66666 0.126269,-13.32142 4.646472,0.0181 3.439989,-0.009 9.848987,-0.1894 0.09586,-3.7736 0.133082,-3.0791 0.126269,-7.38674 0.18259,-3.73943 -0.486609,-10.54308 4.293149,-14.96288 4.779758,-4.4198 13.606811,-3.64808 22.223356,-3.53554 -0.04417,5.73754 -0.03936,9.37986 0,12.87945 -5.049924,0.46388 -7.309188,-0.33689 -10.85914,1.26269 -1.403378,3.17794 -1.569601,4.80531 -1.262691,11.93242 3.147964,-0.13336 8.201788,-0.1378 12.626907,0 -0.995158,6.00899 -0.948285,7.62376 -1.767767,13.06882 -3.676625,0.088 -5.605721,-0.1488 -11.111678,0 -0.148814,6.756 0.357147,33.0107 0,40.1536 -6.428576,0.1786 -8.174438,-0.03 -14.394674,0 z</Geometry>
-    <Geometry x:Key="TwitterGeometry">m 10.44335,90 c 11.073313,0.3952 19.483106,-1.8358 23.901837,-7.1603 -7.9736,-1.4292 -11.832311,-4.1933 -15.078321,-11.0837 3.459698,0.8219 5.795894,0.6358 7.606781,-0.607 -7.19593,-1.719 -12.734543,-6.7971 -13.741664,-15.836 2.766355,1.55307 5.466848,2.66623 7.828682,2.0203 -4.336544,-2.92911 -9.838998,-10.47636 -5.555839,-22.47589 8.400675,11.87052 23.824269,17.67568 33.840111,17.67767 -0.936406,-9.74688 5.88057,-19.46521 15.302849,-19.97853 8.13118,-0.50719 10.57457,4.01944 12.476346,4.82624 3.644547,0.13419 7.393301,-1.74401 10.354063,-3.53553 -1.380842,4.47157 -5.06769,5.62903 -6.313453,8.58629 5.42317,0.41513 5.891376,-1.53111 8.333758,-2.0203 -2.071414,3.75017 -5.393863,5.00034 -7.323606,8.08122 -1.633654,16.12573 -5.16049,27.57123 -14.647212,36.36553 -13.825764,11.3764 -34.755458,17.369 -56.984332,5.14 z</Geometry>
-    <Geometry x:Key="ThumbsUpGeometry">M68.191078 915.462005l161.384597 0L229.575676 431.30719 68.191078 431.30719 68.191078 915.462005zM955.808922 471.653083c0-44.582381-36.109406-80.69281-80.69281-80.69281L620.329241 390.960273 658.859789 206.578915c0.807389-4.034896 1.412163-8.271384 1.412163-12.709463 0-16.743336-6.859221-31.873941-17.752316-42.767036l-42.968627-42.565445L333.871043 374.216937c-14.524808 14.7264-23.602557 34.899858-23.602557 57.090253l0 403.462005c0 44.582381 36.109406 80.69281 80.69281 80.69281l363.116111 0c33.487695 0 62.133106-20.37505 74.236771-49.222051l121.643478-284.441261c3.63069-9.279341 5.850242-19.164478 5.850242-29.452799L955.807898 475.083206l-0.403183-0.403183L955.808922 471.653083z</Geometry>
-    <Geometry x:Key="ImageGeometry">M736 224H288a64 64 0 0 0-64 64v448a64 64 0 0 0 64 64h448a64 64 0 0 0 64-64V288a64 64 0 0 0-64-64z m-416 160a64 64 0 1 1 128.032 0.032A64 64 0 0 1 320 384z m416 320a32 32 0 0 1-32 32H384a32 32 0 0 1-32-32l96-160c26.432-2.048 68.128 6.016 128 64l128-224a32 32 0 0 1 32 32v288z</Geometry>
-    <Geometry x:Key="KeyboardGeometry">M19.692308 512A25 25 0 1 1 19.692308 531.692308ZM512 303.027832C512 286.548884 524.86564 273.174666 540.717948 273.174666L598.153846 273.174666C614.006154 273.174666 626.871794 286.548884 626.871794 303.027832L626.871794 362.734167C626.871794 379.213115 614.006154 392.587333 598.153846 392.587333L540.717948 392.587333C524.86564 392.587333 512 379.213115 512 362.734167L512 303.027832 512 303.027832ZM512 482.146834 512 541.853166C512 558.332115 499.13436 571.706335 483.282052 571.706335L425.846154 571.706335C409.993846 571.706335 397.128206 558.332115 397.128206 541.853166L397.128206 482.146834C397.128206 465.667885 409.993846 452.293665 425.846154 452.293665L483.282052 452.293665C499.13436 452.293665 512 465.667885 512 482.146834L512 482.146834ZM339.692308 303.027832C339.692308 286.548884 352.557948 273.174666 368.410256 273.174666L425.846154 273.174666C441.698462 273.174666 454.564102 286.548884 454.564102 303.027832L454.564102 362.734167C454.564102 379.213115 441.698462 392.587333 425.846154 392.587333L368.410256 392.587333C352.557948 392.587333 339.692308 379.213115 339.692308 362.734167L339.692308 303.027832 339.692308 303.027832ZM167.384615 303.027832C167.384615 286.548884 180.250256 273.174666 196.102564 273.174666L253.538462 273.174666C269.390769 273.174666 282.25641 286.548884 282.25641 303.027832L282.25641 362.734167C282.25641 379.213115 269.390769 392.587333 253.538462 392.587333L196.102564 392.587333C180.250256 392.587333 167.384615 379.213115 167.384615 362.734167L167.384615 303.027832 167.384615 303.027832ZM282.25641 720.972168C282.25641 737.451116 269.390769 750.825334 253.538462 750.825334L196.102564 750.825334C180.250256 750.825334 167.384615 737.451116 167.384615 720.972168L167.384615 661.265833C167.384615 644.786885 180.250256 631.412667 196.102564 631.412667L253.538462 631.412667C269.390769 631.412667 282.25641 644.786885 282.25641 661.265833L282.25641 720.972168 282.25641 720.972168ZM310.97436 571.706335 253.538462 571.706335C237.686154 571.706335 224.820513 558.332115 224.820513 541.853166L224.820513 482.146834C224.820513 465.667885 237.686154 452.293665 253.538462 452.293665L310.97436 452.293665C326.826667 452.293665 339.692308 465.667885 339.692308 482.146834L339.692308 541.853166C339.692308 558.332115 326.826667 571.706335 310.97436 571.706335L310.97436 571.706335ZM569.435898 720.972168C569.435898 737.451116 556.570256 750.825334 540.717948 750.825334L368.410256 750.825334C352.557948 750.825334 339.692308 737.451116 339.692308 720.972168L339.692308 661.265833C339.692308 644.786885 352.557948 631.412667 368.410256 631.412667L540.717948 631.412667C556.570256 631.412667 569.435898 644.786885 569.435898 661.265833L569.435898 720.972168 569.435898 720.972168ZM569.435898 541.853166 569.435898 482.146834C569.435898 465.667885 582.301538 452.293665 598.153846 452.293665L655.589744 452.293665C671.442052 452.293665 684.307692 465.667885 684.307692 482.146834L684.307692 541.853166C684.307692 558.332115 671.442052 571.706335 655.589744 571.706335L598.153846 571.706335C582.301538 571.706335 569.435898 558.332115 569.435898 541.853166L569.435898 541.853166ZM856.615385 720.972168C856.615385 737.451116 843.749744 750.825334 827.897437 750.825334L655.589744 750.825334C639.737437 750.825334 626.871794 737.451116 626.871794 720.972168L626.871794 661.265833C626.871794 644.786885 639.737437 631.412667 655.589744 631.412667L713.02564 631.412667C728.877948 631.412667 741.74359 618.038449 741.74359 601.559501L741.74359 482.146834C741.74359 465.667885 754.609231 452.293665 770.461538 452.293665L827.897437 452.293665C843.749744 452.293665 856.615385 465.667885 856.615385 482.146834L856.615385 720.972168 856.615385 720.972168ZM856.615385 362.734167C856.615385 379.213115 843.749744 392.587333 827.897437 392.587333L713.02564 392.587333C697.173333 392.587333 684.307692 379.213115 684.307692 362.734167L684.307692 303.027832C684.307692 286.548884 697.173333 273.174666 713.02564 273.174666L827.897437 273.174666C843.749744 273.174666 856.615385 286.548884 856.615385 303.027832L856.615385 362.734167 856.615385 362.734167Z</Geometry>
-    <Geometry x:Key="LoveGeometry">M890.2 208.2c-91.8-91.9-242.1-91.9-334 0L544.4 220c-18.2 18.2-47.6 18.2-65.8 0l-11.8-11.8c-91.9-91.9-242.1-91.9-334 0C41 300 24.7 533.9 203.6 722.1 304 827.8 412.4 882.3 470 905.9c26.6 10.9 56.5 10.9 83 0 57.6-23.6 166-78.1 266.4-183.8 178.9-188.2 162.6-422 70.8-513.9z</Geometry>
-    <Geometry x:Key="CnblogsGeometry">M512 0C229.234472 0 0 229.226146 0 512 0 794.765528 229.234472 1024 512 1024S1024 794.765528 1024 512C1024 229.226146 794.765528 0 512 0zM228.776585 836.066862c-63.163317 0-114.371642-51.208325-114.371642-114.371642S165.613268 607.323577 228.776585 607.323577s114.371642 51.208325 114.371643 114.371643c0 63.171642-51.208325 114.371642-114.371643 114.371642z m420.555968-89.612488a391.867317 391.867317 0 0 1-1.989724 16.975089c-7.259577 30.203837-33.950179 52.898341-66.376845 52.898342-38.104455 0-68.990959-34.158309-68.99096-72.204488 0-5.877593 0.81587-11.463805 2.206179-16.775284-1.756618-131.096976-103.981789-237.867707-233.205593-246.883903l-6.343805-0.740943-1.015675-0.041626c-5.453008-0.216455-10.930992-0.732618-16.142569-2.331057a67.958634 67.958634 0 0 1-47.91987-65.078114c0-37.604943 30.245463-68.091837 67.550699-68.091837 0.299707 0 0.591089 0.041626 0.890797 0.049951l0.124878-0.049951c205.707447 2.139577 371.836878 169.484488 371.836878 375.699772 0 7.717463-0.341333 15.34335-0.824195 22.94426 0.066602 1.207154 0.19148 2.397659 0.199805 3.629789z m254.085203-63.329821c-10.856065 45.172553-25.80813 104.114992-74.310764 104.114992-56.994341 0-48.236228-66.085463-48.236228-122.996553 0-8.791415 1.223805-17.149919 3.296781-25.100488-2.639089-196.108488-169.834146-387.812943-363.137041-401.291447l-35.806699-5.827642c-42.117203-7.492683-111.715902-3.255154-111.715903-49.193626 0-56.253398 50.234276-81.861724 106.038114-81.861724 0.449561 0 0.882472 0.058276 1.332033 0.066602l0.183154-0.066602c307.724488 3.180228 526.252748 208.546341 526.252748 517.028423a538.474146 538.474146 0 0 1-1.23213 34.316488c0.108228 1.806569 0.291382 3.596488 0.308033 5.428032a542.72 542.72 0 0 1-2.972098 25.383545z</Geometry>
-    <Geometry x:Key="ConfigGeometry">M827.904 541.184a278.592 278.592 0 0 0 0-58.368l73.728-58.368c15.872-13.056 20.224-35.584 9.728-53.504l-78.592-137.728c-9.984-17.408-31.232-25.856-51.712-18.176l-86.528 35.072c-15.872-11.52-32.512-21.248-49.664-29.184l-12.8-92.928c-3.072-20.224-20.736-35.584-41.216-35.584h-157.44c-20.736 0-38.144 14.848-41.216 35.84L378.88 221.44c-17.152 7.936-33.792 17.92-49.664 29.184L242.688 215.296c-18.688-7.168-41.216 0.768-51.2 18.176L112.64 371.2c-10.24 17.92-6.144 40.448 10.24 53.76l73.472 58.112c-1.024 9.472-1.536 19.2-1.536 29.184 0 9.728 0.512 19.456 1.536 29.184l-73.984 58.368c-15.872 13.056-19.968 35.584-9.728 53.248l78.848 137.728c9.984 17.408 32 25.856 51.456 17.92l86.528-35.072c15.872 11.52 32.512 21.248 49.664 29.184l13.056 93.696c3.328 20.48 20.48 35.328 41.216 35.328h157.44c20.48 0 38.144-15.36 41.216-35.84l13.056-93.184c17.152-7.936 33.792-17.664 49.664-29.184l86.784 35.328c4.864 1.792 9.984 2.816 15.104 2.816 14.848 0 28.672-7.936 36.096-20.992l78.592-137.728c10.24-17.664 6.4-40.192-9.984-53.76l-73.472-58.112z m-25.344 231.168l-99.584-40.448c-7.424-3.072-15.872-1.792-22.272 3.072-19.712 15.36-40.704 27.648-62.464 36.608-7.424 3.072-12.544 9.728-13.568 17.664l-14.592 104.96-155.392 2.304-15.104-107.264c-1.024-7.936-6.4-14.592-13.568-17.664-21.76-8.96-42.752-21.504-62.464-36.608-4.096-3.072-8.96-4.608-13.824-4.608-2.816 0-5.888 0.512-8.448 1.536l-96.256 41.472-80.896-137.216 84.48-66.816c6.144-4.864 9.472-12.8 8.448-20.48-1.536-12.032-2.56-24.32-2.56-36.608 0-12.288 1.024-24.576 2.56-36.608 1.024-7.936-2.048-15.616-8.448-20.48l-83.712-64 76.544-139.264 99.584 40.448c7.424 3.072 15.872 1.792 22.272-3.072 19.712-15.36 40.96-27.648 62.72-36.864 7.424-3.072 12.544-9.728 13.568-17.664l12.544-104.704 157.696-2.304 15.104 107.264c1.024 7.936 6.4 14.592 13.568 17.664 21.76 8.96 42.752 21.504 62.464 36.864 6.4 4.864 14.848 6.144 22.272 3.072l96.256-41.472 80.896 137.216-84.48 66.816c-6.144 4.864-9.472 12.544-8.448 20.48 1.536 12.032 2.56 24.32 2.56 36.608 0 12.288-1.024 24.576-2.56 36.608-1.024 7.936 2.304 15.616 8.448 20.48l83.712 63.744-77.056 139.264zM512 345.6c-91.136 0-165.12 74.752-165.12 166.4s73.984 166.4 165.12 166.4 165.12-74.752 165.12-166.4-73.984-166.4-165.12-166.4z m0 297.216c-71.168 0-129.28-58.624-129.28-130.816 0-72.192 58.112-130.816 129.28-130.816s129.28 58.624 129.28 130.816c0 72.192-57.856 130.816-129.28 130.816z</Geometry>
-    <Geometry x:Key="ContributorsGeometry">M657.486769 287.744c5.671385 0 11.264-5.671385 16.935385-5.671385l186.289231-124.140307c5.592615-5.592615 16.935385-16.935385 16.935384-28.199385V73.334154A74.673231 74.673231 0 0 0 804.233846 0H606.680615v220.002462c0 22.606769-16.935385 33.870769-39.463384 33.870769H454.262154c-22.528 0-39.463385-16.935385-39.463385-33.870769V5.671385H222.838154c-45.134769 0-79.005538 33.870769-79.005539 73.255384v56.477539c0 11.264 5.671385 22.528 16.935385 28.199384l186.289231 124.140308h16.935384C200.310154 349.735385 98.697846 507.746462 121.304615 693.878154c22.528 169.275077 169.353846 310.350769 344.221539 327.207384 237.095385 28.199385 440.32-152.339692 440.32-377.934769 0-158.011077-101.612308-299.008-248.359385-355.406769z m-146.747077 671.271385C335.793231 959.015385 189.046154 818.018462 189.046154 643.150769c0-174.867692 146.747077-310.350769 321.693538-310.350769 174.946462 0 321.693538 141.075692 321.693539 315.943385s-146.747077 310.350769-321.693539 310.350769zM670.798769 572.967385l-68.371692-11.185231a31.507692 31.507692 0 0 1-28.514462-16.777846l-28.514461-55.926154c-17.092923-27.963077-51.278769-27.963077-68.371692 0l-28.514462 55.926154a31.507692 31.507692 0 0 1-28.514462 16.777846l-68.371692 11.185231c-28.514462 5.592615-39.936 39.148308-17.092923 61.44l45.528615 39.227077c5.750154 11.185231 17.171692 22.370462 11.421539 33.555692l-11.421539 67.111384c-5.671385 27.963077 28.514462 50.333538 51.357539 33.555693l62.700308-27.963077a37.021538 37.021538 0 0 1 34.185846 0l62.700307 33.555692c28.514462 16.777846 57.028923-5.592615 51.27877-33.555692l-11.421539-67.111385c0-16.777846 5.750154-27.963077 11.421539-33.555692l51.278769-44.740923a38.596923 38.596923 0 0 0-22.843077-61.518769z</Geometry>
-    <Geometry x:Key="GitHubStrGeometry">M1185.92 769.92h-1.28c0.576 0 0.96 0.64 1.536 0.704h0.384l-0.64-0.64z m0.256 0.704c-5.952 0.064-20.928 3.2-36.736 3.2-49.92 0-67.2-23.04-67.2-53.12V520.32h101.76c5.76 0 10.24-5.12 10.24-12.16v-108.8c0-5.76-5.12-10.88-10.24-10.88h-101.76V253.44c0-5.12-3.2-8.32-8.96-8.32h-138.24c-5.76 0-8.96 3.2-8.96 8.32v138.88s-69.76 17.28-74.24 17.92c-5.12 1.28-8.32 5.76-8.32 10.88v87.04c0 7.04 5.12 12.16 10.88 12.16h71.04v209.92c0 156.16 108.8 172.16 183.04 172.16 33.92 0 74.88-10.88 81.28-14.08 3.84-1.28 5.76-5.76 5.76-10.24v-96a11.328 11.328 0 0 0-9.344-11.52z m1516.544-140.8c0-115.84-46.72-131.2-96-126.08-38.4 2.56-69.12 21.76-69.12 21.76v225.28s31.36 21.76 78.08 23.04c65.92 1.92 87.04-21.76 87.04-144z m155.52-10.24c0 219.52-71.04 282.24-195.2 282.24-104.96 0-161.28-53.12-161.28-53.12s-2.56 29.44-5.76 33.28c-1.92 3.84-5.12 5.12-8.96 5.12h-94.72c-6.4 0-12.16-5.12-12.16-10.88l1.28-711.04c0-5.76 5.12-10.88 10.88-10.88h136.32c5.76 0 10.88 5.12 10.88 10.88v241.28s52.48-33.92 129.28-33.92l-0.64-1.28c76.8 0 190.08 28.8 190.08 248.32z m-558.08-231.04H2165.76c-7.04 0-10.88 5.12-10.88 12.16v348.16s-35.2 24.96-83.2 24.96-62.08-21.76-62.08-69.76V400c0-5.76-5.12-10.88-10.88-10.88h-136.96c-5.76 0-10.88 5.12-10.88 10.88v327.04c0 140.8 78.72 176 186.88 176 88.96 0 161.28-49.28 161.28-49.28s3.2 24.96 5.12 28.8c1.28 3.2 5.76 5.76 10.24 5.76h85.76c7.04 0 10.88-5.12 10.88-10.88l1.28-478.08c0-5.76-5.12-10.88-12.16-10.88z m-1516.8-0.64h-136.32c-5.76 0-10.88 5.76-10.88 12.8v469.76c0 12.8 8.32 17.28 19.2 17.28h122.88c12.8 0 16-5.76 16-17.28V398.72c0-5.76-5.12-10.88-10.88-10.88z m-67.2-216.32c-49.28 0-88.32 39.04-88.32 88.32 0 49.28 39.04 88.32 88.32 88.32 48 0 87.04-39.04 87.04-88.32 0-49.28-39.04-88.32-87.04-88.32z m1055.36-16h-135.04c-5.76 0-10.88 5.12-10.88 10.88v261.76h-211.84V166.4c0-5.76-5.12-10.88-10.88-10.88h-136.32c-5.76 0-10.88 5.12-10.88 10.88v711.04c0 5.76 5.76 10.88 10.88 10.88h136.32c5.76 0 10.88-5.12 10.88-10.88V573.44h211.84l-1.28 304c0 5.76 5.12 10.88 10.88 10.88h136.32c5.76 0 10.88-5.12 10.88-10.88V166.4c0-5.76-5.12-10.88-10.88-10.88zM563.84 470.4v367.36c0 2.56-0.64 7.04-3.84 8.32 0 0-80 56.96-211.84 56.96-159.36 0-348.16-49.92-348.16-378.88S165.12 127.36 326.4 128c139.52 0 195.84 31.36 204.8 37.12 2.56 3.2 3.84 5.76 3.84 8.96L508.16 288c0 5.76-5.76 12.8-12.8 10.88-23.04-7.04-57.6-21.12-138.88-21.12-94.08 0-195.2 26.88-195.2 238.72s96 236.8 165.12 236.8c58.88 0 80-7.04 80-7.04v-147.2H312.32c-7.04 0-12.16-5.12-12.16-10.88V470.4c0-5.76 5.12-10.88 12.16-10.88h239.36c7.04 0 12.16 5.12 12.16 10.88z</Geometry>
-    <Geometry x:Key="QqGeometry">M936.194300839506 691.6934192494618c-5.891587367822223-94.26540047423211-70.69904970840491-170.8560375504593-106.04857520987652-212.09715041975304 5.891587367822223-11.783174735644446 17.674762103466666-79.53643140740742-29.457938133649378-126.66913164452346V349.981342854005c0-182.63921228610366-129.61492468116543-315.1999312984493-294.57937486380246-315.1999312984493s-294.57937615834066 132.5607190123457-294.57937615834066 315.1999312984493v2.9457943311802466c-47.132700237116055 47.132700237116055-35.349525501471604 114.885956908879-29.45793683911111 126.66913164452346-35.349525501471604 41.24111286929382-100.15698784205432 117.83174994552098-106.04857520987652 212.09715041975304 0 23.56634947128889 2.9457943311802466 58.91587497276049 14.728969066824689 76.59063707622718 14.728969066824689 20.62055643464691 55.97008193611851-2.9457943311802466 82.48222444404936-64.80746234058272 8.837381699002469 29.457938133649378 26.51214380246913 73.64484403958517 67.75325667176295 126.66913164452346-70.69904970840491 14.728969066824689-88.37381310640988 85.42801877522965-64.80746234058272 123.72333731334321 17.674762103466666 26.51214380246913 53.02428760493826 47.132700237116055 120.77754298216297 47.132700237116055 114.885956908879 0 167.9102445138173-32.40373117029136 191.4765952796444-53.02428760493826 5.891587367822223-5.891587367822223 11.783174735644446-5.891587367822223 20.620555140108642-5.891587367822223 8.837381699002469 0 14.728969066824689 2.9457943311802466 20.62055643464691 5.891587367822223 23.56634947128889 20.62055643464691 73.64484403958517 53.02428760493826 191.4765939851062 53.02428760493826 64.80746234058272 0 103.10278087869627-20.62055643464691 120.77754427670124-47.132700237116055 23.56634947128889-38.29531853811359 2.9457943311802466-106.04857520987652-64.80746234058272-123.72333731334321 41.24111286929382-55.97008193611851 58.91587497276049-100.15698784205432 67.75325667176295-126.66913164452346 29.457938133649378 61.86166930394074 67.75325667176295 85.42801877522965 82.48222444404936 64.80746234058272 5.891587367822223-17.674762103466666 11.783174735644446-53.02428760493826 8.837381699002469-76.59063707622718z m0 0</Geometry>
-    <Geometry x:Key="ProjectGeometry">M838.4 325.12 554.24 479.36C528 493.44 512 521.6 512 552.96l0 298.24c0 32 31.36 53.12 57.6 38.4l284.16-154.24c25.6-14.08 42.24-42.24 42.24-73.6L896 364.16C896 331.52 864.64 311.04 838.4 325.12zM405.76 478.72 121.6 325.12C95.36 311.04 64 331.52 64 363.52l0 299.52c0 31.36 16 59.52 42.24 73.6l284.16 153.6C416.64 904.32 448 883.2 448 851.2L448 552.32C448 520.96 432 492.8 405.76 478.72zM812.16 255.36c13.44-7.04 19.84-19.2 18.56-30.72 1.28-12.16-5.12-23.68-18.56-30.72L522.88 42.88c-12.8-7.04-28.16-10.24-43.52-10.24-15.36 0-30.72 3.2-43.52 10.24L146.56 193.28C133.12 200.32 127.36 212.48 128 224 127.36 236.16 133.12 248.32 146.56 255.36l289.28 150.4c12.8 7.04 28.16 10.24 43.52 10.24 15.36 0 30.72-3.2 43.52-10.24L812.16 255.36z</Geometry>
-    <Geometry x:Key="BlogGeometry">M1137.575865 0l0 795.939663-267.130435 228.060337-870.44543 0 0-1024 1137.575865 0zM795.939663 682.363798l-626.030169 0 0 113.575865 626.030169 0 0-113.575865zM966.757764 455.212067l-796.84827 0 0 113.575865 796.84827 0 0-113.575865zM966.757764 227.15173l-796.84827 0 0 114.484472 796.84827 0 0-114.484472z</Geometry>
-    <Geometry x:Key="VisualStudioGeometry">M23.063,0L11,12L3,6L0,7v15l3,2l8-6l11.875,12L30,27V2.938L23.063,0z M3,19v-8l5,4L3,19z M23,21l-8-6l8-6V21z</Geometry>
-    <Geometry x:Key="CodeGeometry">M288.752 319.495c-12.497-12.497-32.758-12.497-45.255 0L73.619 489.372a32 32 0 0 0 0 45.254l169.878 169.879c6.249 6.248 14.438 9.372 22.627 9.372s16.379-3.124 22.627-9.372c12.497-12.497 12.497-32.759 0-45.255L141.502 512l147.25-147.25c12.497-12.497 12.497-32.758 0-45.255zM950.38 489.372L780.504 319.495c-12.498-12.497-32.759-12.497-45.255 0-12.497 12.497-12.497 32.758 0 45.255L882.499 512l-147.25 147.251c-12.496 12.496-12.496 32.758 0.001 45.255 6.248 6.248 14.438 9.372 22.627 9.372s16.379-3.124 22.628-9.373l169.877-169.878c12.496-12.497 12.496-32.758-0.002-45.255zM600.417 312.63c-16.289-6.858-35.052 0.785-41.91 17.074L415.451 669.46c-6.858 16.288 0.786 35.052 17.074 41.91a31.892 31.892 0 0 0 12.404 2.517c12.488 0 24.355-7.359 29.506-19.591L617.491 354.54c6.858-16.288-0.786-35.052-17.074-41.91z</Geometry>
-    <Geometry x:Key="WikiGeometry">M638.72 808.533333 529.493333 551.253333C485.973333 636.16 438.186667 725.333333 397.226667 808.533333 396.8 808.96 377.173333 808.533333 377.173333 808.533333 314.453333 661.333333 249.6 516.266667 186.453333 370.346667 171.946667 334.506667 120.746667 277.333333 85.333333 277.333333 85.333333 273.066667 85.333333 263.68 85.333333 258.133333L301.226667 258.133333 301.226667 277.333333C275.626667 277.333333 232.106667 294.4 243.2 322.133333 273.92 387.84 381.44 642.56 410.88 707.413333 430.933333 667.306667 487.68 561.493333 512 516.693333 492.8 479.146667 432.213333 338.346667 414.293333 303.36 400.64 280.32 366.08 277.333333 339.626667 277.333333 339.626667 270.933333 340.053333 266.666667 339.626667 258.56L529.92 258.986667 529.92 276.053333C503.893333 277.333333 479.573333 286.293333 490.666667 311.04 516.266667 363.946667 531.2 401.92 554.666667 450.986667 561.92 436.48 600.32 357.546667 618.666667 316.16 629.76 288.426667 613.12 277.333333 567.04 277.333333 567.466667 272.213333 567.466667 263.253333 567.466667 258.986667 626.773333 258.56 715.946667 258.56 731.733333 258.133333L731.733333 276.053333C701.44 277.333333 670.293333 293.546667 654.08 318.293333L576 482.133333C583.68 503.893333 659.626667 672.426667 667.733333 691.2L832 314.453333C819.2 283.733333 782.506667 277.333333 768 277.333333 768 271.786667 768 264.533333 768 258.133333L938.666667 259.413333 938.666667 260.266667 938.666667 277.333333C901.12 277.333333 877.653333 298.666667 864 330.666667 829.866667 407.04 725.333333 650.24 657.066667 808.533333 657.066667 808.533333 638.72 808.533333 638.72 808.533333Z</Geometry>
-    <Geometry x:Key="DocGeometry">M173.826977 510.432295c0-122.019031-0.050142-244.038062 0.022513-366.057093 0.032746-54.232159 27.618011-81.962733 81.740676-82.012875 117.26475-0.10847 234.532571-0.400113 351.790158 0.567935 10.968819 0.090051 24.65554 5.861498 32.362059 13.658068 66.276473 67.050092 131.747603 134.908596 196.58633 203.352431 7.161097 7.559163 12.495592 20.287045 12.535501 30.641881 0.738827 189.363835 0.623193 378.731764 0.480954 568.098669-0.036839 49.259914-28.894074 77.959559-78.538751 78.007655-172.727946 0.166799-345.455893 0.165776-518.183839 0.002047-50.561559-0.048095-78.714759-28.893051-78.760808-80.201623C173.752276 754.470357 173.826977 632.451326 173.826977 510.432295zM425.726078 715.13242c-0.409322 52.42193 32.43983 88.344071 81.254605 88.856747 48.829102 0.512676 83.016739-35.294854 83.205027-87.148849 0.190335-52.300156-32.965809-88.35942-81.524758-88.665389C459.317127 627.863844 426.136424 662.654208 425.726078 715.13242zM265.914302 633.581056c0 56.69935 0 110.830201 0 166.16446 23.783683 0 45.88505 0.218988 67.980277-0.049119 36.362162-0.441045 61.114916-17.009396 71.76958-47.599088 13.557784-38.924521 4.252861-85.525885-22.836101-104.649432-9.880021-6.974855-22.768563-12.386098-34.668591-13.255908C321.448106 632.240525 294.495244 633.581056 265.914302 633.581056zM758.306732 689.51088c-9.967002-45.812395-41.170678-66.920132-86.082564-60.683081-42.587957 5.913687-71.66418 46.171576-67.992557 94.137007 3.773953 49.296753 35.82902 80.999802 81.923848 81.025385 42.137703 0.023536 68.915579-25.63382 71.465658-69.621661-10.092869 0-20.128433 0-30.109762 0-16.044418 36.365232-36.768415 47.330982-62.482053 33.178657-19.942191-10.975982-28.691459-39.623439-21.979594-69.791529 4.77884-21.481244 16.022928-36.523845 39.027875-38.340213 21.590737-1.704828 35.721573 9.087982 40.968064 30.095435C735.017306 689.51088 745.964636 689.51088 758.306732 689.51088zM635.406634 159.644977c0 32.664957-0.671289 69.714781 0.62524 106.695021 0.230244 6.566556 8.422833 18.209734 13.30912 18.408255 37.929868 1.542122 75.950809 0.851391 113.944122 0.851391 1.113357-2.461051 2.226714-4.92108 3.340071-7.382131C722.585159 238.422158 678.54513 198.626803 635.406634 159.644977zM553.603537 717.1381c-0.353041 34.149774-17.751293 55.144948-45.725414 55.175647-29.049616 0.031722-45.502333-21.023826-44.98454-57.571207 0.49528-34.968419 17.328667-55.873542 44.977377-55.858192C535.765263 658.899698 553.965787 682.0827 553.603537 717.1381zM298.449299 770.413468c0-37.08564 0-71.501474 0-107.650789 25.056676-1.242294 50.77236-6.163373 66.627467 18.401092 13.642718 21.135366 14.034645 45.815465 2.095731 67.677379C352.412328 775.868713 325.439 771.676228 298.449299 770.413468z</Geometry>
+    <Geometry o:Freeze="True" x:Key="NewGeometry">M512 0h1216a512 512 0 1 1 0 1024H512A512 512 0 1 1 512 0zM420.16 311.04V768h74.88V433.92h2.56l228.48 334.08h72.96V311.04h-75.52v329.6h-2.56l-225.92-329.6h-74.88z m468.48 0V768h340.48v-64h-265.6V565.76h239.36v-64h-239.36V375.04h254.72v-64h-329.6z m369.28 0l131.2 456.96h80l89.6-343.68h2.56l88.96 343.68h79.36l131.84-456.96h-84.48l-85.76 347.52h-2.56l-90.24-347.52h-77.44l-90.24 347.52h-2.56l-85.76-347.52h-84.48z</Geometry>
+    <Geometry o:Freeze="True" x:Key="LogoGeometry">M40.493382,19.001303 C36.637875,19.06448 33.938568,21.421986 33.948524,25.271919 L34.068279,71.56765 34.066906,71.598007 34.068745,71.747833 34.18895,118.21758 C34.202225,123.35083 39.026951,129.19344 44.965271,131.2674 50.903587,133.34137 55.706783,130.86133 55.693504,125.72808 L55.589508,85.524513 93.866371,85.524513 93.950943,118.21758 C93.964218,123.35083 98.788948,129.19344 104.72726,131.2674 110.66558,133.34137 115.46878,130.86133 115.4555,125.72808 L115.33575,79.432381 115.33712,79.401993 115.33528,79.252007 115.21507,32.782413 C115.2018,27.64917 110.37708,21.806566 104.43876,19.732603 98.500435,17.658638 93.697243,20.138674 93.710518,25.271919 L93.814514,65.475487 55.537647,65.475487 55.453079,32.782413 C55.439804,27.64917 50.615082,21.806566 44.676762,19.732603 43.192181,19.214111 41.778549,18.980244 40.493382,19.001303 z M9.999999,0 L140,0 C145.52284,0 150,4.4771523 150,9.999999 L150,140 C150,145.52284 145.52284,150 140,150 L9.999999,150 C4.4771523,150 0,145.52284 0,140 L0,9.999999 C0,4.4771523 4.4771523,0 9.999999,0 z</Geometry>
+    <Geometry o:Freeze="True" x:Key="CirclePanelDemoGeometry">M28.677037,-2.2499313E-22 C38.75065,24.740243 38.50705,52.437974 27.999852,77.000001 L-1.7053028E-13,65.206651 C7.3550318,48.013234 7.5255431,28.624822 0.4740567,11.306663 z</Geometry>
+    <Geometry o:Freeze="True" x:Key="CirclePanelRightGeometry">M267.287478 892.162257c0 45.149912 59.597884 71.336861 93.008818 37.925926L740.458554 549.925926c21.671958-21.671958 21.671958-54.179894 0-75.851852L360.296296 93.911817c-33.410935-33.410935-93.008818-5.417989-93.008818 38.828924v759.421516z m0 0</Geometry>
+    <Geometry o:Freeze="True" x:Key="GithubGeometry">M512 0C229.12 0 0 229.12 0 512c0 226.56 146.56 417.92 350.08 485.76 25.6 4.48 35.2-10.88 35.2-24.32 0-12.16-0.64-52.48-0.64-95.36-128.64 23.68-161.92-31.36-172.16-60.16-5.76-14.72-30.72-60.16-52.48-72.32-17.92-9.6-43.52-33.28-0.64-33.92 40.32-0.64 69.12 37.12 78.72 52.48 46.08 77.44 119.68 55.68 149.12 42.24 4.48-33.28 17.92-55.68 32.64-68.48-113.92-12.8-232.96-56.96-232.96-252.8 0-55.68 19.84-101.76 52.48-137.6-5.12-12.8-23.04-65.28 5.12-135.68 0 0 42.88-13.44 140.8 52.48 40.96-11.52 84.48-17.28 128-17.28 43.52 0 87.04 5.76 128 17.28 97.92-66.56 140.8-52.48 140.8-52.48 28.16 70.4 10.24 122.88 5.12 135.68 32.64 35.84 52.48 81.28 52.48 137.6 0 196.48-119.68 240-233.6 252.8 18.56 16 34.56 46.72 34.56 94.72 0 68.48-0.64 123.52-0.64 140.8 0 13.44 9.6 29.44 35.2 24.32A512.832 512.832 0 0 0 1024 512c0-282.88-229.12-512-512-512z</Geometry>
+    <Geometry o:Freeze="True" x:Key="NugetGeometry">M449.722947 199.412211H706.021053c130.967579 0 237.136842 106.169263 237.136842 237.136842v256.298105c0 130.967579-106.169263 237.136842-237.136842 237.136842H449.722947c-130.965895 0-237.136842-106.169263-237.136842-237.136842V436.549053c0-130.967579 106.170947-237.136842 237.136842-237.136842z m-201.205894-21.557895c0-64.299789-70.085053-104.704-125.850948-72.55579s-55.764211 112.96 0 145.111579 125.850947-8.257684 125.850948-72.555789z m239.528421 234.74021c0-68.003368-74.088421-110.736842-133.037474-76.734315s-58.950737 119.467789 0 153.470315 133.039158-8.730947 133.039158-76.736zM835.368421 692.847158c0-117.596632-128.154947-191.494737-230.123789-132.695579s-101.970526 206.593684 0 265.391158S835.368421 810.443789 835.368421 692.847158z</Geometry>
+    <Geometry o:Freeze="True" x:Key="EmailGeometry">M430.079734 481.464543c45.196365 45.596478 118.486578 45.596478 163.68499 0l360.684736-324.939627c0.547469 3.751441 1.13894 7.490601 1.13894 11.401678l0 404.753417 0 116.754121c0 42.995233-34.547841 77.838809-77.145008 77.838809L145.397996 767.272941c-42.597167 0-77.145008-34.844599-77.145008-77.838809L68.252988 494.839155 68.252988 167.926594c0-3.911076 0.593518-7.65126 1.139963-11.401678L430.079734 481.464543zM910.960992 74.226538 562.044278 387.28558c-38.470173 38.811957-62.276369 38.811957-100.770078 0L112.538611 74.408687c10.011005-4.789073 21.069875-7.673773 32.859385-7.673773l733.044372 0C890.095779 66.735937 901.065622 69.539796 910.960992 74.226538z</Geometry>
+    <Geometry o:Freeze="True" x:Key="GitterGeometry">M260.8 645H160V0h100.8v645zM461.8 152.2h-100.8V1024h100.8V152.2z m201.2 0h-100.8V1024h100.8V152.2zM864 152h-100.8v494H864V152z</Geometry>
+    <Geometry o:Freeze="True" x:Key="WebsiteGeometry">M698.026667 597.333333C701.44 569.173333 704 541.013333 704 512 704 482.986667 701.44 454.826667 698.026667 426.666667L842.24 426.666667C849.066667 453.973333 853.333333 482.56 853.333333 512 853.333333 541.44 849.066667 570.026667 842.24 597.333333M622.506667 834.56C648.106667 787.2 667.733333 736 681.386667 682.666667L807.253333 682.666667C766.293333 753.066667 701.013333 807.68 622.506667 834.56M611.84 597.333333 412.16 597.333333C407.893333 569.173333 405.333333 541.013333 405.333333 512 405.333333 482.986667 407.893333 454.4 412.16 426.666667L611.84 426.666667C615.68 454.4 618.666667 482.986667 618.666667 512 618.666667 541.013333 615.68 569.173333 611.84 597.333333M512 851.626667C476.586667 800.426667 448 743.68 430.506667 682.666667L593.493333 682.666667C576 743.68 547.413333 800.426667 512 851.626667M341.333333 341.333333 216.746667 341.333333C257.28 270.506667 322.986667 215.893333 401.066667 189.44 375.466667 236.8 356.266667 288 341.333333 341.333333M216.746667 682.666667 341.333333 682.666667C356.266667 736 375.466667 787.2 401.066667 834.56 322.986667 807.68 257.28 753.066667 216.746667 682.666667M181.76 597.333333C174.933333 570.026667 170.666667 541.44 170.666667 512 170.666667 482.56 174.933333 453.973333 181.76 426.666667L325.973333 426.666667C322.56 454.826667 320 482.986667 320 512 320 541.013333 322.56 569.173333 325.973333 597.333333M512 171.946667C547.413333 223.146667 576 280.32 593.493333 341.333333L430.506667 341.333333C448 280.32 476.586667 223.146667 512 171.946667M807.253333 341.333333 681.386667 341.333333C667.733333 288 648.106667 236.8 622.506667 189.44 701.013333 216.32 766.293333 270.506667 807.253333 341.333333M512 85.333333C276.053333 85.333333 85.333333 277.333333 85.333333 512 85.333333 747.52 276.48 938.666667 512 938.666667 747.52 938.666667 938.666667 747.52 938.666667 512 938.666667 276.48 747.52 85.333333 512 85.333333Z</Geometry>
+    <Geometry o:Freeze="True" x:Key="FaceBookGeometry">m 41.416254,90 c -0.327378,-7.4702 0.20833,-32.7284 0,-39.901 -5.386902,-0.2083 -4.521603,0.3274 -9.848987,0 0.20833,-5.50595 0.36436,-7.66666 0.126269,-13.32142 4.646472,0.0181 3.439989,-0.009 9.848987,-0.1894 0.09586,-3.7736 0.133082,-3.0791 0.126269,-7.38674 0.18259,-3.73943 -0.486609,-10.54308 4.293149,-14.96288 4.779758,-4.4198 13.606811,-3.64808 22.223356,-3.53554 -0.04417,5.73754 -0.03936,9.37986 0,12.87945 -5.049924,0.46388 -7.309188,-0.33689 -10.85914,1.26269 -1.403378,3.17794 -1.569601,4.80531 -1.262691,11.93242 3.147964,-0.13336 8.201788,-0.1378 12.626907,0 -0.995158,6.00899 -0.948285,7.62376 -1.767767,13.06882 -3.676625,0.088 -5.605721,-0.1488 -11.111678,0 -0.148814,6.756 0.357147,33.0107 0,40.1536 -6.428576,0.1786 -8.174438,-0.03 -14.394674,0 z</Geometry>
+    <Geometry o:Freeze="True" x:Key="TwitterGeometry">m 10.44335,90 c 11.073313,0.3952 19.483106,-1.8358 23.901837,-7.1603 -7.9736,-1.4292 -11.832311,-4.1933 -15.078321,-11.0837 3.459698,0.8219 5.795894,0.6358 7.606781,-0.607 -7.19593,-1.719 -12.734543,-6.7971 -13.741664,-15.836 2.766355,1.55307 5.466848,2.66623 7.828682,2.0203 -4.336544,-2.92911 -9.838998,-10.47636 -5.555839,-22.47589 8.400675,11.87052 23.824269,17.67568 33.840111,17.67767 -0.936406,-9.74688 5.88057,-19.46521 15.302849,-19.97853 8.13118,-0.50719 10.57457,4.01944 12.476346,4.82624 3.644547,0.13419 7.393301,-1.74401 10.354063,-3.53553 -1.380842,4.47157 -5.06769,5.62903 -6.313453,8.58629 5.42317,0.41513 5.891376,-1.53111 8.333758,-2.0203 -2.071414,3.75017 -5.393863,5.00034 -7.323606,8.08122 -1.633654,16.12573 -5.16049,27.57123 -14.647212,36.36553 -13.825764,11.3764 -34.755458,17.369 -56.984332,5.14 z</Geometry>
+    <Geometry o:Freeze="True" x:Key="ThumbsUpGeometry">M68.191078 915.462005l161.384597 0L229.575676 431.30719 68.191078 431.30719 68.191078 915.462005zM955.808922 471.653083c0-44.582381-36.109406-80.69281-80.69281-80.69281L620.329241 390.960273 658.859789 206.578915c0.807389-4.034896 1.412163-8.271384 1.412163-12.709463 0-16.743336-6.859221-31.873941-17.752316-42.767036l-42.968627-42.565445L333.871043 374.216937c-14.524808 14.7264-23.602557 34.899858-23.602557 57.090253l0 403.462005c0 44.582381 36.109406 80.69281 80.69281 80.69281l363.116111 0c33.487695 0 62.133106-20.37505 74.236771-49.222051l121.643478-284.441261c3.63069-9.279341 5.850242-19.164478 5.850242-29.452799L955.807898 475.083206l-0.403183-0.403183L955.808922 471.653083z</Geometry>
+    <Geometry o:Freeze="True" x:Key="ImageGeometry">M736 224H288a64 64 0 0 0-64 64v448a64 64 0 0 0 64 64h448a64 64 0 0 0 64-64V288a64 64 0 0 0-64-64z m-416 160a64 64 0 1 1 128.032 0.032A64 64 0 0 1 320 384z m416 320a32 32 0 0 1-32 32H384a32 32 0 0 1-32-32l96-160c26.432-2.048 68.128 6.016 128 64l128-224a32 32 0 0 1 32 32v288z</Geometry>
+    <Geometry o:Freeze="True" x:Key="KeyboardGeometry">M19.692308 512A25 25 0 1 1 19.692308 531.692308ZM512 303.027832C512 286.548884 524.86564 273.174666 540.717948 273.174666L598.153846 273.174666C614.006154 273.174666 626.871794 286.548884 626.871794 303.027832L626.871794 362.734167C626.871794 379.213115 614.006154 392.587333 598.153846 392.587333L540.717948 392.587333C524.86564 392.587333 512 379.213115 512 362.734167L512 303.027832 512 303.027832ZM512 482.146834 512 541.853166C512 558.332115 499.13436 571.706335 483.282052 571.706335L425.846154 571.706335C409.993846 571.706335 397.128206 558.332115 397.128206 541.853166L397.128206 482.146834C397.128206 465.667885 409.993846 452.293665 425.846154 452.293665L483.282052 452.293665C499.13436 452.293665 512 465.667885 512 482.146834L512 482.146834ZM339.692308 303.027832C339.692308 286.548884 352.557948 273.174666 368.410256 273.174666L425.846154 273.174666C441.698462 273.174666 454.564102 286.548884 454.564102 303.027832L454.564102 362.734167C454.564102 379.213115 441.698462 392.587333 425.846154 392.587333L368.410256 392.587333C352.557948 392.587333 339.692308 379.213115 339.692308 362.734167L339.692308 303.027832 339.692308 303.027832ZM167.384615 303.027832C167.384615 286.548884 180.250256 273.174666 196.102564 273.174666L253.538462 273.174666C269.390769 273.174666 282.25641 286.548884 282.25641 303.027832L282.25641 362.734167C282.25641 379.213115 269.390769 392.587333 253.538462 392.587333L196.102564 392.587333C180.250256 392.587333 167.384615 379.213115 167.384615 362.734167L167.384615 303.027832 167.384615 303.027832ZM282.25641 720.972168C282.25641 737.451116 269.390769 750.825334 253.538462 750.825334L196.102564 750.825334C180.250256 750.825334 167.384615 737.451116 167.384615 720.972168L167.384615 661.265833C167.384615 644.786885 180.250256 631.412667 196.102564 631.412667L253.538462 631.412667C269.390769 631.412667 282.25641 644.786885 282.25641 661.265833L282.25641 720.972168 282.25641 720.972168ZM310.97436 571.706335 253.538462 571.706335C237.686154 571.706335 224.820513 558.332115 224.820513 541.853166L224.820513 482.146834C224.820513 465.667885 237.686154 452.293665 253.538462 452.293665L310.97436 452.293665C326.826667 452.293665 339.692308 465.667885 339.692308 482.146834L339.692308 541.853166C339.692308 558.332115 326.826667 571.706335 310.97436 571.706335L310.97436 571.706335ZM569.435898 720.972168C569.435898 737.451116 556.570256 750.825334 540.717948 750.825334L368.410256 750.825334C352.557948 750.825334 339.692308 737.451116 339.692308 720.972168L339.692308 661.265833C339.692308 644.786885 352.557948 631.412667 368.410256 631.412667L540.717948 631.412667C556.570256 631.412667 569.435898 644.786885 569.435898 661.265833L569.435898 720.972168 569.435898 720.972168ZM569.435898 541.853166 569.435898 482.146834C569.435898 465.667885 582.301538 452.293665 598.153846 452.293665L655.589744 452.293665C671.442052 452.293665 684.307692 465.667885 684.307692 482.146834L684.307692 541.853166C684.307692 558.332115 671.442052 571.706335 655.589744 571.706335L598.153846 571.706335C582.301538 571.706335 569.435898 558.332115 569.435898 541.853166L569.435898 541.853166ZM856.615385 720.972168C856.615385 737.451116 843.749744 750.825334 827.897437 750.825334L655.589744 750.825334C639.737437 750.825334 626.871794 737.451116 626.871794 720.972168L626.871794 661.265833C626.871794 644.786885 639.737437 631.412667 655.589744 631.412667L713.02564 631.412667C728.877948 631.412667 741.74359 618.038449 741.74359 601.559501L741.74359 482.146834C741.74359 465.667885 754.609231 452.293665 770.461538 452.293665L827.897437 452.293665C843.749744 452.293665 856.615385 465.667885 856.615385 482.146834L856.615385 720.972168 856.615385 720.972168ZM856.615385 362.734167C856.615385 379.213115 843.749744 392.587333 827.897437 392.587333L713.02564 392.587333C697.173333 392.587333 684.307692 379.213115 684.307692 362.734167L684.307692 303.027832C684.307692 286.548884 697.173333 273.174666 713.02564 273.174666L827.897437 273.174666C843.749744 273.174666 856.615385 286.548884 856.615385 303.027832L856.615385 362.734167 856.615385 362.734167Z</Geometry>
+    <Geometry o:Freeze="True" x:Key="LoveGeometry">M890.2 208.2c-91.8-91.9-242.1-91.9-334 0L544.4 220c-18.2 18.2-47.6 18.2-65.8 0l-11.8-11.8c-91.9-91.9-242.1-91.9-334 0C41 300 24.7 533.9 203.6 722.1 304 827.8 412.4 882.3 470 905.9c26.6 10.9 56.5 10.9 83 0 57.6-23.6 166-78.1 266.4-183.8 178.9-188.2 162.6-422 70.8-513.9z</Geometry>
+    <Geometry o:Freeze="True" x:Key="CnblogsGeometry">M512 0C229.234472 0 0 229.226146 0 512 0 794.765528 229.234472 1024 512 1024S1024 794.765528 1024 512C1024 229.226146 794.765528 0 512 0zM228.776585 836.066862c-63.163317 0-114.371642-51.208325-114.371642-114.371642S165.613268 607.323577 228.776585 607.323577s114.371642 51.208325 114.371643 114.371643c0 63.171642-51.208325 114.371642-114.371643 114.371642z m420.555968-89.612488a391.867317 391.867317 0 0 1-1.989724 16.975089c-7.259577 30.203837-33.950179 52.898341-66.376845 52.898342-38.104455 0-68.990959-34.158309-68.99096-72.204488 0-5.877593 0.81587-11.463805 2.206179-16.775284-1.756618-131.096976-103.981789-237.867707-233.205593-246.883903l-6.343805-0.740943-1.015675-0.041626c-5.453008-0.216455-10.930992-0.732618-16.142569-2.331057a67.958634 67.958634 0 0 1-47.91987-65.078114c0-37.604943 30.245463-68.091837 67.550699-68.091837 0.299707 0 0.591089 0.041626 0.890797 0.049951l0.124878-0.049951c205.707447 2.139577 371.836878 169.484488 371.836878 375.699772 0 7.717463-0.341333 15.34335-0.824195 22.94426 0.066602 1.207154 0.19148 2.397659 0.199805 3.629789z m254.085203-63.329821c-10.856065 45.172553-25.80813 104.114992-74.310764 104.114992-56.994341 0-48.236228-66.085463-48.236228-122.996553 0-8.791415 1.223805-17.149919 3.296781-25.100488-2.639089-196.108488-169.834146-387.812943-363.137041-401.291447l-35.806699-5.827642c-42.117203-7.492683-111.715902-3.255154-111.715903-49.193626 0-56.253398 50.234276-81.861724 106.038114-81.861724 0.449561 0 0.882472 0.058276 1.332033 0.066602l0.183154-0.066602c307.724488 3.180228 526.252748 208.546341 526.252748 517.028423a538.474146 538.474146 0 0 1-1.23213 34.316488c0.108228 1.806569 0.291382 3.596488 0.308033 5.428032a542.72 542.72 0 0 1-2.972098 25.383545z</Geometry>
+    <Geometry o:Freeze="True" x:Key="ConfigGeometry">M827.904 541.184a278.592 278.592 0 0 0 0-58.368l73.728-58.368c15.872-13.056 20.224-35.584 9.728-53.504l-78.592-137.728c-9.984-17.408-31.232-25.856-51.712-18.176l-86.528 35.072c-15.872-11.52-32.512-21.248-49.664-29.184l-12.8-92.928c-3.072-20.224-20.736-35.584-41.216-35.584h-157.44c-20.736 0-38.144 14.848-41.216 35.84L378.88 221.44c-17.152 7.936-33.792 17.92-49.664 29.184L242.688 215.296c-18.688-7.168-41.216 0.768-51.2 18.176L112.64 371.2c-10.24 17.92-6.144 40.448 10.24 53.76l73.472 58.112c-1.024 9.472-1.536 19.2-1.536 29.184 0 9.728 0.512 19.456 1.536 29.184l-73.984 58.368c-15.872 13.056-19.968 35.584-9.728 53.248l78.848 137.728c9.984 17.408 32 25.856 51.456 17.92l86.528-35.072c15.872 11.52 32.512 21.248 49.664 29.184l13.056 93.696c3.328 20.48 20.48 35.328 41.216 35.328h157.44c20.48 0 38.144-15.36 41.216-35.84l13.056-93.184c17.152-7.936 33.792-17.664 49.664-29.184l86.784 35.328c4.864 1.792 9.984 2.816 15.104 2.816 14.848 0 28.672-7.936 36.096-20.992l78.592-137.728c10.24-17.664 6.4-40.192-9.984-53.76l-73.472-58.112z m-25.344 231.168l-99.584-40.448c-7.424-3.072-15.872-1.792-22.272 3.072-19.712 15.36-40.704 27.648-62.464 36.608-7.424 3.072-12.544 9.728-13.568 17.664l-14.592 104.96-155.392 2.304-15.104-107.264c-1.024-7.936-6.4-14.592-13.568-17.664-21.76-8.96-42.752-21.504-62.464-36.608-4.096-3.072-8.96-4.608-13.824-4.608-2.816 0-5.888 0.512-8.448 1.536l-96.256 41.472-80.896-137.216 84.48-66.816c6.144-4.864 9.472-12.8 8.448-20.48-1.536-12.032-2.56-24.32-2.56-36.608 0-12.288 1.024-24.576 2.56-36.608 1.024-7.936-2.048-15.616-8.448-20.48l-83.712-64 76.544-139.264 99.584 40.448c7.424 3.072 15.872 1.792 22.272-3.072 19.712-15.36 40.96-27.648 62.72-36.864 7.424-3.072 12.544-9.728 13.568-17.664l12.544-104.704 157.696-2.304 15.104 107.264c1.024 7.936 6.4 14.592 13.568 17.664 21.76 8.96 42.752 21.504 62.464 36.864 6.4 4.864 14.848 6.144 22.272 3.072l96.256-41.472 80.896 137.216-84.48 66.816c-6.144 4.864-9.472 12.544-8.448 20.48 1.536 12.032 2.56 24.32 2.56 36.608 0 12.288-1.024 24.576-2.56 36.608-1.024 7.936 2.304 15.616 8.448 20.48l83.712 63.744-77.056 139.264zM512 345.6c-91.136 0-165.12 74.752-165.12 166.4s73.984 166.4 165.12 166.4 165.12-74.752 165.12-166.4-73.984-166.4-165.12-166.4z m0 297.216c-71.168 0-129.28-58.624-129.28-130.816 0-72.192 58.112-130.816 129.28-130.816s129.28 58.624 129.28 130.816c0 72.192-57.856 130.816-129.28 130.816z</Geometry>
+    <Geometry o:Freeze="True" x:Key="ContributorsGeometry">M657.486769 287.744c5.671385 0 11.264-5.671385 16.935385-5.671385l186.289231-124.140307c5.592615-5.592615 16.935385-16.935385 16.935384-28.199385V73.334154A74.673231 74.673231 0 0 0 804.233846 0H606.680615v220.002462c0 22.606769-16.935385 33.870769-39.463384 33.870769H454.262154c-22.528 0-39.463385-16.935385-39.463385-33.870769V5.671385H222.838154c-45.134769 0-79.005538 33.870769-79.005539 73.255384v56.477539c0 11.264 5.671385 22.528 16.935385 28.199384l186.289231 124.140308h16.935384C200.310154 349.735385 98.697846 507.746462 121.304615 693.878154c22.528 169.275077 169.353846 310.350769 344.221539 327.207384 237.095385 28.199385 440.32-152.339692 440.32-377.934769 0-158.011077-101.612308-299.008-248.359385-355.406769z m-146.747077 671.271385C335.793231 959.015385 189.046154 818.018462 189.046154 643.150769c0-174.867692 146.747077-310.350769 321.693538-310.350769 174.946462 0 321.693538 141.075692 321.693539 315.943385s-146.747077 310.350769-321.693539 310.350769zM670.798769 572.967385l-68.371692-11.185231a31.507692 31.507692 0 0 1-28.514462-16.777846l-28.514461-55.926154c-17.092923-27.963077-51.278769-27.963077-68.371692 0l-28.514462 55.926154a31.507692 31.507692 0 0 1-28.514462 16.777846l-68.371692 11.185231c-28.514462 5.592615-39.936 39.148308-17.092923 61.44l45.528615 39.227077c5.750154 11.185231 17.171692 22.370462 11.421539 33.555692l-11.421539 67.111384c-5.671385 27.963077 28.514462 50.333538 51.357539 33.555693l62.700308-27.963077a37.021538 37.021538 0 0 1 34.185846 0l62.700307 33.555692c28.514462 16.777846 57.028923-5.592615 51.27877-33.555692l-11.421539-67.111385c0-16.777846 5.750154-27.963077 11.421539-33.555692l51.278769-44.740923a38.596923 38.596923 0 0 0-22.843077-61.518769z</Geometry>
+    <Geometry o:Freeze="True" x:Key="GitHubStrGeometry">M1185.92 769.92h-1.28c0.576 0 0.96 0.64 1.536 0.704h0.384l-0.64-0.64z m0.256 0.704c-5.952 0.064-20.928 3.2-36.736 3.2-49.92 0-67.2-23.04-67.2-53.12V520.32h101.76c5.76 0 10.24-5.12 10.24-12.16v-108.8c0-5.76-5.12-10.88-10.24-10.88h-101.76V253.44c0-5.12-3.2-8.32-8.96-8.32h-138.24c-5.76 0-8.96 3.2-8.96 8.32v138.88s-69.76 17.28-74.24 17.92c-5.12 1.28-8.32 5.76-8.32 10.88v87.04c0 7.04 5.12 12.16 10.88 12.16h71.04v209.92c0 156.16 108.8 172.16 183.04 172.16 33.92 0 74.88-10.88 81.28-14.08 3.84-1.28 5.76-5.76 5.76-10.24v-96a11.328 11.328 0 0 0-9.344-11.52z m1516.544-140.8c0-115.84-46.72-131.2-96-126.08-38.4 2.56-69.12 21.76-69.12 21.76v225.28s31.36 21.76 78.08 23.04c65.92 1.92 87.04-21.76 87.04-144z m155.52-10.24c0 219.52-71.04 282.24-195.2 282.24-104.96 0-161.28-53.12-161.28-53.12s-2.56 29.44-5.76 33.28c-1.92 3.84-5.12 5.12-8.96 5.12h-94.72c-6.4 0-12.16-5.12-12.16-10.88l1.28-711.04c0-5.76 5.12-10.88 10.88-10.88h136.32c5.76 0 10.88 5.12 10.88 10.88v241.28s52.48-33.92 129.28-33.92l-0.64-1.28c76.8 0 190.08 28.8 190.08 248.32z m-558.08-231.04H2165.76c-7.04 0-10.88 5.12-10.88 12.16v348.16s-35.2 24.96-83.2 24.96-62.08-21.76-62.08-69.76V400c0-5.76-5.12-10.88-10.88-10.88h-136.96c-5.76 0-10.88 5.12-10.88 10.88v327.04c0 140.8 78.72 176 186.88 176 88.96 0 161.28-49.28 161.28-49.28s3.2 24.96 5.12 28.8c1.28 3.2 5.76 5.76 10.24 5.76h85.76c7.04 0 10.88-5.12 10.88-10.88l1.28-478.08c0-5.76-5.12-10.88-12.16-10.88z m-1516.8-0.64h-136.32c-5.76 0-10.88 5.76-10.88 12.8v469.76c0 12.8 8.32 17.28 19.2 17.28h122.88c12.8 0 16-5.76 16-17.28V398.72c0-5.76-5.12-10.88-10.88-10.88z m-67.2-216.32c-49.28 0-88.32 39.04-88.32 88.32 0 49.28 39.04 88.32 88.32 88.32 48 0 87.04-39.04 87.04-88.32 0-49.28-39.04-88.32-87.04-88.32z m1055.36-16h-135.04c-5.76 0-10.88 5.12-10.88 10.88v261.76h-211.84V166.4c0-5.76-5.12-10.88-10.88-10.88h-136.32c-5.76 0-10.88 5.12-10.88 10.88v711.04c0 5.76 5.76 10.88 10.88 10.88h136.32c5.76 0 10.88-5.12 10.88-10.88V573.44h211.84l-1.28 304c0 5.76 5.12 10.88 10.88 10.88h136.32c5.76 0 10.88-5.12 10.88-10.88V166.4c0-5.76-5.12-10.88-10.88-10.88zM563.84 470.4v367.36c0 2.56-0.64 7.04-3.84 8.32 0 0-80 56.96-211.84 56.96-159.36 0-348.16-49.92-348.16-378.88S165.12 127.36 326.4 128c139.52 0 195.84 31.36 204.8 37.12 2.56 3.2 3.84 5.76 3.84 8.96L508.16 288c0 5.76-5.76 12.8-12.8 10.88-23.04-7.04-57.6-21.12-138.88-21.12-94.08 0-195.2 26.88-195.2 238.72s96 236.8 165.12 236.8c58.88 0 80-7.04 80-7.04v-147.2H312.32c-7.04 0-12.16-5.12-12.16-10.88V470.4c0-5.76 5.12-10.88 12.16-10.88h239.36c7.04 0 12.16 5.12 12.16 10.88z</Geometry>
+    <Geometry o:Freeze="True" x:Key="QqGeometry">M936.194300839506 691.6934192494618c-5.891587367822223-94.26540047423211-70.69904970840491-170.8560375504593-106.04857520987652-212.09715041975304 5.891587367822223-11.783174735644446 17.674762103466666-79.53643140740742-29.457938133649378-126.66913164452346V349.981342854005c0-182.63921228610366-129.61492468116543-315.1999312984493-294.57937486380246-315.1999312984493s-294.57937615834066 132.5607190123457-294.57937615834066 315.1999312984493v2.9457943311802466c-47.132700237116055 47.132700237116055-35.349525501471604 114.885956908879-29.45793683911111 126.66913164452346-35.349525501471604 41.24111286929382-100.15698784205432 117.83174994552098-106.04857520987652 212.09715041975304 0 23.56634947128889 2.9457943311802466 58.91587497276049 14.728969066824689 76.59063707622718 14.728969066824689 20.62055643464691 55.97008193611851-2.9457943311802466 82.48222444404936-64.80746234058272 8.837381699002469 29.457938133649378 26.51214380246913 73.64484403958517 67.75325667176295 126.66913164452346-70.69904970840491 14.728969066824689-88.37381310640988 85.42801877522965-64.80746234058272 123.72333731334321 17.674762103466666 26.51214380246913 53.02428760493826 47.132700237116055 120.77754298216297 47.132700237116055 114.885956908879 0 167.9102445138173-32.40373117029136 191.4765952796444-53.02428760493826 5.891587367822223-5.891587367822223 11.783174735644446-5.891587367822223 20.620555140108642-5.891587367822223 8.837381699002469 0 14.728969066824689 2.9457943311802466 20.62055643464691 5.891587367822223 23.56634947128889 20.62055643464691 73.64484403958517 53.02428760493826 191.4765939851062 53.02428760493826 64.80746234058272 0 103.10278087869627-20.62055643464691 120.77754427670124-47.132700237116055 23.56634947128889-38.29531853811359 2.9457943311802466-106.04857520987652-64.80746234058272-123.72333731334321 41.24111286929382-55.97008193611851 58.91587497276049-100.15698784205432 67.75325667176295-126.66913164452346 29.457938133649378 61.86166930394074 67.75325667176295 85.42801877522965 82.48222444404936 64.80746234058272 5.891587367822223-17.674762103466666 11.783174735644446-53.02428760493826 8.837381699002469-76.59063707622718z m0 0</Geometry>
+    <Geometry o:Freeze="True" x:Key="ProjectGeometry">M838.4 325.12 554.24 479.36C528 493.44 512 521.6 512 552.96l0 298.24c0 32 31.36 53.12 57.6 38.4l284.16-154.24c25.6-14.08 42.24-42.24 42.24-73.6L896 364.16C896 331.52 864.64 311.04 838.4 325.12zM405.76 478.72 121.6 325.12C95.36 311.04 64 331.52 64 363.52l0 299.52c0 31.36 16 59.52 42.24 73.6l284.16 153.6C416.64 904.32 448 883.2 448 851.2L448 552.32C448 520.96 432 492.8 405.76 478.72zM812.16 255.36c13.44-7.04 19.84-19.2 18.56-30.72 1.28-12.16-5.12-23.68-18.56-30.72L522.88 42.88c-12.8-7.04-28.16-10.24-43.52-10.24-15.36 0-30.72 3.2-43.52 10.24L146.56 193.28C133.12 200.32 127.36 212.48 128 224 127.36 236.16 133.12 248.32 146.56 255.36l289.28 150.4c12.8 7.04 28.16 10.24 43.52 10.24 15.36 0 30.72-3.2 43.52-10.24L812.16 255.36z</Geometry>
+    <Geometry o:Freeze="True" x:Key="BlogGeometry">M1137.575865 0l0 795.939663-267.130435 228.060337-870.44543 0 0-1024 1137.575865 0zM795.939663 682.363798l-626.030169 0 0 113.575865 626.030169 0 0-113.575865zM966.757764 455.212067l-796.84827 0 0 113.575865 796.84827 0 0-113.575865zM966.757764 227.15173l-796.84827 0 0 114.484472 796.84827 0 0-114.484472z</Geometry>
+    <Geometry o:Freeze="True" x:Key="VisualStudioGeometry">M23.063,0L11,12L3,6L0,7v15l3,2l8-6l11.875,12L30,27V2.938L23.063,0z M3,19v-8l5,4L3,19z M23,21l-8-6l8-6V21z</Geometry>
+    <Geometry o:Freeze="True" x:Key="CodeGeometry">M288.752 319.495c-12.497-12.497-32.758-12.497-45.255 0L73.619 489.372a32 32 0 0 0 0 45.254l169.878 169.879c6.249 6.248 14.438 9.372 22.627 9.372s16.379-3.124 22.627-9.372c12.497-12.497 12.497-32.759 0-45.255L141.502 512l147.25-147.25c12.497-12.497 12.497-32.758 0-45.255zM950.38 489.372L780.504 319.495c-12.498-12.497-32.759-12.497-45.255 0-12.497 12.497-12.497 32.758 0 45.255L882.499 512l-147.25 147.251c-12.496 12.496-12.496 32.758 0.001 45.255 6.248 6.248 14.438 9.372 22.627 9.372s16.379-3.124 22.628-9.373l169.877-169.878c12.496-12.497 12.496-32.758-0.002-45.255zM600.417 312.63c-16.289-6.858-35.052 0.785-41.91 17.074L415.451 669.46c-6.858 16.288 0.786 35.052 17.074 41.91a31.892 31.892 0 0 0 12.404 2.517c12.488 0 24.355-7.359 29.506-19.591L617.491 354.54c6.858-16.288-0.786-35.052-17.074-41.91z</Geometry>
+    <Geometry o:Freeze="True" x:Key="WikiGeometry">M638.72 808.533333 529.493333 551.253333C485.973333 636.16 438.186667 725.333333 397.226667 808.533333 396.8 808.96 377.173333 808.533333 377.173333 808.533333 314.453333 661.333333 249.6 516.266667 186.453333 370.346667 171.946667 334.506667 120.746667 277.333333 85.333333 277.333333 85.333333 273.066667 85.333333 263.68 85.333333 258.133333L301.226667 258.133333 301.226667 277.333333C275.626667 277.333333 232.106667 294.4 243.2 322.133333 273.92 387.84 381.44 642.56 410.88 707.413333 430.933333 667.306667 487.68 561.493333 512 516.693333 492.8 479.146667 432.213333 338.346667 414.293333 303.36 400.64 280.32 366.08 277.333333 339.626667 277.333333 339.626667 270.933333 340.053333 266.666667 339.626667 258.56L529.92 258.986667 529.92 276.053333C503.893333 277.333333 479.573333 286.293333 490.666667 311.04 516.266667 363.946667 531.2 401.92 554.666667 450.986667 561.92 436.48 600.32 357.546667 618.666667 316.16 629.76 288.426667 613.12 277.333333 567.04 277.333333 567.466667 272.213333 567.466667 263.253333 567.466667 258.986667 626.773333 258.56 715.946667 258.56 731.733333 258.133333L731.733333 276.053333C701.44 277.333333 670.293333 293.546667 654.08 318.293333L576 482.133333C583.68 503.893333 659.626667 672.426667 667.733333 691.2L832 314.453333C819.2 283.733333 782.506667 277.333333 768 277.333333 768 271.786667 768 264.533333 768 258.133333L938.666667 259.413333 938.666667 260.266667 938.666667 277.333333C901.12 277.333333 877.653333 298.666667 864 330.666667 829.866667 407.04 725.333333 650.24 657.066667 808.533333 657.066667 808.533333 638.72 808.533333 638.72 808.533333Z</Geometry>
+    <Geometry o:Freeze="True" x:Key="DocGeometry">M173.826977 510.432295c0-122.019031-0.050142-244.038062 0.022513-366.057093 0.032746-54.232159 27.618011-81.962733 81.740676-82.012875 117.26475-0.10847 234.532571-0.400113 351.790158 0.567935 10.968819 0.090051 24.65554 5.861498 32.362059 13.658068 66.276473 67.050092 131.747603 134.908596 196.58633 203.352431 7.161097 7.559163 12.495592 20.287045 12.535501 30.641881 0.738827 189.363835 0.623193 378.731764 0.480954 568.098669-0.036839 49.259914-28.894074 77.959559-78.538751 78.007655-172.727946 0.166799-345.455893 0.165776-518.183839 0.002047-50.561559-0.048095-78.714759-28.893051-78.760808-80.201623C173.752276 754.470357 173.826977 632.451326 173.826977 510.432295zM425.726078 715.13242c-0.409322 52.42193 32.43983 88.344071 81.254605 88.856747 48.829102 0.512676 83.016739-35.294854 83.205027-87.148849 0.190335-52.300156-32.965809-88.35942-81.524758-88.665389C459.317127 627.863844 426.136424 662.654208 425.726078 715.13242zM265.914302 633.581056c0 56.69935 0 110.830201 0 166.16446 23.783683 0 45.88505 0.218988 67.980277-0.049119 36.362162-0.441045 61.114916-17.009396 71.76958-47.599088 13.557784-38.924521 4.252861-85.525885-22.836101-104.649432-9.880021-6.974855-22.768563-12.386098-34.668591-13.255908C321.448106 632.240525 294.495244 633.581056 265.914302 633.581056zM758.306732 689.51088c-9.967002-45.812395-41.170678-66.920132-86.082564-60.683081-42.587957 5.913687-71.66418 46.171576-67.992557 94.137007 3.773953 49.296753 35.82902 80.999802 81.923848 81.025385 42.137703 0.023536 68.915579-25.63382 71.465658-69.621661-10.092869 0-20.128433 0-30.109762 0-16.044418 36.365232-36.768415 47.330982-62.482053 33.178657-19.942191-10.975982-28.691459-39.623439-21.979594-69.791529 4.77884-21.481244 16.022928-36.523845 39.027875-38.340213 21.590737-1.704828 35.721573 9.087982 40.968064 30.095435C735.017306 689.51088 745.964636 689.51088 758.306732 689.51088zM635.406634 159.644977c0 32.664957-0.671289 69.714781 0.62524 106.695021 0.230244 6.566556 8.422833 18.209734 13.30912 18.408255 37.929868 1.542122 75.950809 0.851391 113.944122 0.851391 1.113357-2.461051 2.226714-4.92108 3.340071-7.382131C722.585159 238.422158 678.54513 198.626803 635.406634 159.644977zM553.603537 717.1381c-0.353041 34.149774-17.751293 55.144948-45.725414 55.175647-29.049616 0.031722-45.502333-21.023826-44.98454-57.571207 0.49528-34.968419 17.328667-55.873542 44.977377-55.858192C535.765263 658.899698 553.965787 682.0827 553.603537 717.1381zM298.449299 770.413468c0-37.08564 0-71.501474 0-107.650789 25.056676-1.242294 50.77236-6.163373 66.627467 18.401092 13.642718 21.135366 14.034645 45.815465 2.095731 67.677379C352.412328 775.868713 325.439 771.676228 298.449299 770.413468z</Geometry>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml
index e80af070..44a46462 100644
--- a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml
@@ -34,6 +34,10 @@
         </Setter>
     </Style>
 
+    <Style x:Key="TabItemTransparent" BasedOn="{StaticResource TabItemInLine}" TargetType="TabItem">
+        <Setter Property="Background" Value="Transparent"/>
+    </Style>
+
     <Style x:Key="ListBoxItemTransparent" BasedOn="{StaticResource ListBoxItemBaseStyle}" TargetType="ListBoxItem">
         <Setter Property="Background" Value="Transparent"/>
     </Style>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml
index 8d247656..43d45e3e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml
@@ -8,14 +8,14 @@
     <UserControl.Resources>
         <Style x:Key="Button4PoptipStyle" BasedOn="{StaticResource {x:Type Button}}" TargetType="Button">
             <Setter Property="Width" Value="{x:Static system:Double.NaN}"/>
-            <Setter Property="Height" Value="50"/>
+            <Setter Property="Height" Value="40"/>
             <Setter Property="MinWidth" Value="100"/>
             <Setter Property="HorizontalAlignment" Value="Stretch"/>
             <Setter Property="Content" Value="{Binding Tag,RelativeSource={RelativeSource Self},Converter={StaticResource Int2StringConverter},ConverterParameter={x:Static langs:Lang.PoptipPositionStr}}"/>
         </Style>
         <Style x:Key="ToggleButton4PoptipStyle" BasedOn="{StaticResource {x:Type ToggleButton}}" TargetType="ToggleButton">
             <Setter Property="Width" Value="{x:Static system:Double.NaN}"/>
-            <Setter Property="Height" Value="50"/>
+            <Setter Property="Height" Value="40"/>
             <Setter Property="MinWidth" Value="100"/>
             <Setter Property="HorizontalAlignment" Value="Stretch"/>
             <Setter Property="Content" Value="{Binding Tag,RelativeSource={RelativeSource Self},Converter={StaticResource Int2StringConverter},ConverterParameter={x:Static langs:Lang.PoptipPositionStr}}"/>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
index 6776dbbc..7c3dc3d6 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
@@ -25,7 +25,7 @@
     </Border.Resources>
     <DockPanel>
         <Button Command="{Binding OpenOverviewCmd}" DockPanel.Dock="Top" HorizontalAlignment="Stretch" Margin="4" Content="{x:Static langs:Lang.Overview}"/>
-        <TabControl SelectionChanged="TabControl_OnSelectionChanged" ItemsSource="{Binding DemoInfoList}" Style="{StaticResource TabControlInLine}" Background="Transparent" SelectedIndex="0">
+        <TabControl SelectionChanged="TabControl_OnSelectionChanged" ItemContainerStyle="{StaticResource TabItemTransparent}" ItemsSource="{Binding DemoInfoList}" Style="{StaticResource TabControlInLine}" Background="Transparent" SelectedIndex="0">
             <TabControl.ItemTemplate>
                 <DataTemplate>
                     <TextBlock Text="{Binding Title}"/>
@@ -44,7 +44,7 @@
                         </Grid.ColumnDefinitions>
                         <hc:SearchBar SearchStarted="SearchBar_OnSearchStarted" Style="{StaticResource SearchBarPlus}" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterKey}" Margin="4" Tag="{Binding ElementName=ListBoxDemo}"/>
                         <ToggleButton Tag="{Binding ElementName=ListBoxDemo}" Name="ButtonStyleAscending" Click="ButtonAscending_OnClick" Grid.Row="0" Grid.Column="1" Margin="0,0,4,0" Style="{StaticResource DemoInfoSortButtonStyle}"/>
-                        <ListBox Name="ListBoxDemo" SelectedIndex="{Binding SelectedIndex}" ItemsSource="{Binding DemoItemList}" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" BorderThickness="0" SelectionMode="Single" Style="{StaticResource ListBoxTransparent}">
+                        <ListBox Name="ListBoxDemo" VirtualizingStackPanel.IsVirtualizing="True" SelectedIndex="{Binding SelectedIndex}" ItemsSource="{Binding DemoItemList}" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" BorderThickness="0" SelectionMode="Single" Style="{StaticResource ListBoxTransparent}">
                             <ListBox.ItemTemplate>
                                 <DataTemplate>
                                     <StackPanel Orientation="Horizontal">
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs b/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs
index 19bcd7c3..490b9b67 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs
@@ -77,21 +77,21 @@ namespace HandyControl.Controls
 
         protected virtual IntPtr HwndSourceHook(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
         {
-            if (msg <= 71)
+            if (msg <= InteropValues.WM_WINDOWPOSCHANGED)
             {
-                if (msg == 6)
+                if (msg == InteropValues.WM_ACTIVATE)
                 {
                     return IntPtr.Zero;
                 }
 
-                if (msg != 12)
+                if (msg != InteropValues.WM_QUIT)
                 {
                     switch (msg)
                     {
-                        case 70:
+                        case InteropValues.WM_WINDOWPOSCHANGING:
                             WmWindowPosChanging(lParam);
                             return IntPtr.Zero;
-                        case 71:
+                        case InteropValues.WM_WINDOWPOSCHANGED:
                             WmWindowPosChanged(lParam);
                             return IntPtr.Zero;
                         default:
@@ -101,24 +101,24 @@ namespace HandyControl.Controls
             }
             else
             {
-                if (msg <= 166)
+                if (msg <= InteropValues.WM_NCRBUTTONDBLCLK)
                 {
                     switch (msg)
                     {
-                        case 128:
+                        case InteropValues.WM_SETICON:
                             break;
-                        case 129:
-                        case 130:
+                        case InteropValues.WM_NCCREATE:
+                        case InteropValues.WM_NCDESTROY:
                             return IntPtr.Zero;
-                        case 134:
+                        case InteropValues.WM_NCACTIVATE:
                             handled = true;
                             return WmNcActivate(hWnd, wParam);
                         default:
                             switch (msg)
                             {
-                                case 164:
-                                case 165:
-                                case 166:
+                                case InteropValues.WM_NCRBUTTONDOWN:
+                                case InteropValues.WM_NCRBUTTONUP:
+                                case InteropValues.WM_NCRBUTTONDBLCLK:
                                     handled = true;
                                     return IntPtr.Zero;
                                 default:
@@ -130,12 +130,12 @@ namespace HandyControl.Controls
                 {
                     switch (msg)
                     {
-                        case 174:
-                        case 175:
+                        case InteropValues.WM_NCUAHDRAWCAPTION:
+                        case InteropValues.WM_NCUAHDRAWFRAME:
                             handled = true;
                             return IntPtr.Zero;
                         default:
-                            if (msg != 274) return IntPtr.Zero;
+                            if (msg != InteropValues.WM_SYSCOMMAND) return IntPtr.Zero;
                             WmSysCommand(hWnd, wParam);
                             return IntPtr.Zero;
                     }
@@ -410,7 +410,7 @@ namespace HandyControl.Controls
             return result;
         }
 
-        private IntPtr WmNcActivate(IntPtr hWnd, IntPtr wParam) => InteropMethods.DefWindowProc(hWnd, 134, wParam, InteropMethods.HRGN_NONE);
+        private IntPtr WmNcActivate(IntPtr hWnd, IntPtr wParam) => InteropMethods.DefWindowProc(hWnd, InteropValues.WM_NCACTIVATE, wParam, InteropMethods.HRGN_NONE);
 
         private bool IsAeroSnappedToMonitor(IntPtr hWnd)
         {
@@ -423,16 +423,27 @@ namespace HandyControl.Controls
         private void WmSysCommand(IntPtr hWnd, IntPtr wParam)
         {
             var num = InteropMethods.GET_SC_WPARAM(wParam);
-            if (num == 61456)
+            
+            if (num == InteropValues.SC_MOVE)
+            {
                 InteropMethods.RedrawWindow(hWnd, IntPtr.Zero, IntPtr.Zero,
                     InteropValues.RedrawWindowFlags.Invalidate | InteropValues.RedrawWindowFlags.NoChildren |
                     InteropValues.RedrawWindowFlags.UpdateNow | InteropValues.RedrawWindowFlags.Frame);
-            if ((num == 61488 || num == 61472 || num == 61456 || num == 61440) && WindowState == WindowState.Normal &&
-                !IsAeroSnappedToMonitor(hWnd)) _logicalSizeForRestore = new Rect(Left, Top, Width, Height);
-            if (num == 61456 && WindowState == WindowState.Maximized && _logicalSizeForRestore == Rect.Empty)
+            }
+
+            if ((num == InteropValues.SC_MAXIMIZE || num == InteropValues.SC_MINIMIZE || num == InteropValues.SC_MOVE ||
+                 num == InteropValues.SC_SIZE) && WindowState == WindowState.Normal && !IsAeroSnappedToMonitor(hWnd))
+            {
                 _logicalSizeForRestore = new Rect(Left, Top, Width, Height);
-            if (num == 61728 && WindowState != WindowState.Minimized && _logicalSizeForRestore.Width > 0.0 &&
-                _logicalSizeForRestore.Height > 0.0)
+            }
+            
+            if (num == InteropValues.SC_MOVE && WindowState == WindowState.Maximized && _logicalSizeForRestore == Rect.Empty)
+            {
+                _logicalSizeForRestore = new Rect(Left, Top, Width, Height);
+            }
+            
+            if (num == InteropValues.SC_RESTORE && WindowState != WindowState.Minimized && 
+                _logicalSizeForRestore.Width > 0.0 && _logicalSizeForRestore.Height > 0.0)
             {
                 Left = _logicalSizeForRestore.Left;
                 Top = _logicalSizeForRestore.Top;
@@ -444,9 +455,9 @@ namespace HandyControl.Controls
 
         private IntPtr CallDefWindowProcWithoutVisibleStyle(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam)
         {
-            var flag = VisualHelper.ModifyStyle(hWnd, 268435456, 0);
+            var flag = VisualHelper.ModifyStyle(hWnd, InteropValues.WS_VISIBLE, 0);
             var result = InteropMethods.DefWindowProc(hWnd, msg, wParam, lParam);
-            if (flag) VisualHelper.ModifyStyle(hWnd, 0, 268435456);
+            if (flag) VisualHelper.ModifyStyle(hWnd, 0, InteropValues.WS_VISIBLE);
             return result;
         }
 
diff --git a/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmap.cs b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmap.cs
index 66651251..e75f1681 100644
--- a/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmap.cs
+++ b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmap.cs
@@ -85,6 +85,7 @@ namespace HandyControl.Data
                 var array = new byte[BytesPerPixelBgra32 * bitmapImage.PixelWidth * bitmapImage.PixelHeight];
                 var stride = BytesPerPixelBgra32 * bitmapImage.PixelWidth;
                 bitmapImage.CopyPixels(array, stride, 0);
+                bitmapImage.Freeze();
 
                 _transparencyMasks[(int)bitmapPart] =
                     new CachedBitmapInfo(
diff --git a/src/Shared/HandyControl_Shared/Data/HandyControlConfig.cs b/src/Shared/HandyControl_Shared/Data/HandyControlConfig.cs
index 88702c88..4e6d9a23 100644
--- a/src/Shared/HandyControl_Shared/Data/HandyControlConfig.cs
+++ b/src/Shared/HandyControl_Shared/Data/HandyControlConfig.cs
@@ -5,5 +5,7 @@
         public SystemVersionInfo SystemVersionInfo { get; set; }
 
         public string Lang { get; set; }
+
+        public int TimelineFrameRate { get; set; } = 60;
     }
 }
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Basic/Brushes.xaml b/src/Shared/HandyControl_Shared/Themes/Basic/Brushes.xaml
index 555392d9..93849725 100644
--- a/src/Shared/HandyControl_Shared/Themes/Basic/Brushes.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Basic/Brushes.xaml
@@ -1,60 +1,61 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:o="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
 
-    <LinearGradientBrush x:Key="PrimaryBrush" EndPoint="1,0" StartPoint="0,0">
-        <GradientStop Color="{DynamicResource PrimaryColor}" Offset="0"/>
-        <GradientStop Color="{DynamicResource DarkPrimaryColor}" Offset="1"/>
+    <LinearGradientBrush o:Freeze="True" x:Key="PrimaryBrush" EndPoint="1,0" StartPoint="0,0">
+        <GradientStop o:Freeze="True" Color="{DynamicResource PrimaryColor}" Offset="0"/>
+        <GradientStop o:Freeze="True" Color="{DynamicResource DarkPrimaryColor}" Offset="1"/>
     </LinearGradientBrush>
-    <SolidColorBrush x:Key="DarkPrimaryBrush" Color="{DynamicResource DarkPrimaryColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="DarkPrimaryBrush" Color="{DynamicResource DarkPrimaryColor}"/>
 
-    <SolidColorBrush x:Key="PrimaryTextBrush" Color="{DynamicResource PrimaryTextColor}"/>
-    <SolidColorBrush x:Key="SecondaryTextBrush" Color="{DynamicResource SecondaryTextColor}"/>
-    <SolidColorBrush x:Key="ThirdlyTextBrush" Color="{DynamicResource ThirdlyTextColor}"/>
-    <SolidColorBrush x:Key="ReverseTextBrush" Color="{DynamicResource ReverseTextColor}"/>
-    <SolidColorBrush x:Key="TextIconBrush" Color="{DynamicResource TextIconColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="PrimaryTextBrush" Color="{DynamicResource PrimaryTextColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="SecondaryTextBrush" Color="{DynamicResource SecondaryTextColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="ThirdlyTextBrush" Color="{DynamicResource ThirdlyTextColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="ReverseTextBrush" Color="{DynamicResource ReverseTextColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="TextIconBrush" Color="{DynamicResource TextIconColor}"/>
 
-    <SolidColorBrush x:Key="BorderBrush" Color="{DynamicResource BorderColor}"/>
-    <SolidColorBrush x:Key="SecondaryBorderBrush" Color="{DynamicResource SecondaryBorderColor}"/>
-    <SolidColorBrush x:Key="BackgroundBrush" Color="{DynamicResource BackgroundColor}"/>
-    <SolidColorBrush x:Key="RegionBrush" Color="{DynamicResource RegionColor}"/>
-    <SolidColorBrush x:Key="SecondaryRegionBrush" Color="{DynamicResource SecondaryRegionColor}"/>
-    <SolidColorBrush x:Key="ThirdlyRegionBrush" Color="{DynamicResource ThirdlyRegionColor}"/>
-    <LinearGradientBrush x:Key="TitleBrush" EndPoint="1,0" StartPoint="0,0">
-        <GradientStop Color="{DynamicResource TitleColor}" Offset="0"/>
-        <GradientStop Color="{DynamicResource SecondaryTitleColor}" Offset="1"/>
+    <SolidColorBrush o:Freeze="True" x:Key="BorderBrush" Color="{DynamicResource BorderColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="SecondaryBorderBrush" Color="{DynamicResource SecondaryBorderColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="BackgroundBrush" Color="{DynamicResource BackgroundColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="RegionBrush" Color="{DynamicResource RegionColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="SecondaryRegionBrush" Color="{DynamicResource SecondaryRegionColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="ThirdlyRegionBrush" Color="{DynamicResource ThirdlyRegionColor}"/>
+    <LinearGradientBrush o:Freeze="True" x:Key="TitleBrush" EndPoint="1,0" StartPoint="0,0">
+        <GradientStop o:Freeze="True" Color="{DynamicResource TitleColor}" Offset="0"/>
+        <GradientStop o:Freeze="True" Color="{DynamicResource SecondaryTitleColor}" Offset="1"/>
     </LinearGradientBrush>
 
-    <SolidColorBrush x:Key="DefaultBrush" Color="{DynamicResource DefaultColor}"/>
-    <SolidColorBrush x:Key="DarkDefaultBrush" Color="{DynamicResource DarkDefaultColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="DefaultBrush" Color="{DynamicResource DefaultColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="DarkDefaultBrush" Color="{DynamicResource DarkDefaultColor}"/>
 
-    <LinearGradientBrush x:Key="DangerBrush" EndPoint="1,0" StartPoint="0,0">
-        <GradientStop Color="{DynamicResource DangerColor}" Offset="0"/>
-        <GradientStop Color="{DynamicResource DarkDangerColor}" Offset="1"/>
+    <LinearGradientBrush o:Freeze="True" x:Key="DangerBrush" EndPoint="1,0" StartPoint="0,0">
+        <GradientStop o:Freeze="True" Color="{DynamicResource DangerColor}" Offset="0"/>
+        <GradientStop o:Freeze="True" Color="{DynamicResource DarkDangerColor}" Offset="1"/>
     </LinearGradientBrush>
-    <SolidColorBrush x:Key="DarkDangerBrush" Color="{DynamicResource DarkDangerColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="DarkDangerBrush" Color="{DynamicResource DarkDangerColor}"/>
 
-    <LinearGradientBrush x:Key="WarningBrush" EndPoint="1,0" StartPoint="0,0">
-        <GradientStop Color="{DynamicResource WarningColor}" Offset="0"/>
-        <GradientStop Color="{DynamicResource DarkWarningColor}" Offset="1"/>
+    <LinearGradientBrush o:Freeze="True" x:Key="WarningBrush" EndPoint="1,0" StartPoint="0,0">
+        <GradientStop o:Freeze="True" Color="{DynamicResource WarningColor}" Offset="0"/>
+        <GradientStop o:Freeze="True" Color="{DynamicResource DarkWarningColor}" Offset="1"/>
     </LinearGradientBrush>
-    <SolidColorBrush x:Key="DarkWarningBrush" Color="{DynamicResource DarkWarningColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="DarkWarningBrush" Color="{DynamicResource DarkWarningColor}"/>
 
-    <LinearGradientBrush x:Key="InfoBrush" EndPoint="1,0" StartPoint="0,0">
-        <GradientStop Color="{DynamicResource InfoColor}" Offset="0"/>
-        <GradientStop Color="{DynamicResource DarkInfoColor}" Offset="1"/>
+    <LinearGradientBrush o:Freeze="True" x:Key="InfoBrush" EndPoint="1,0" StartPoint="0,0">
+        <GradientStop o:Freeze="True" Color="{DynamicResource InfoColor}" Offset="0"/>
+        <GradientStop o:Freeze="True" Color="{DynamicResource DarkInfoColor}" Offset="1"/>
     </LinearGradientBrush>
-    <SolidColorBrush x:Key="DarkInfoBrush" Color="{DynamicResource DarkInfoColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="DarkInfoBrush" Color="{DynamicResource DarkInfoColor}"/>
 
-    <LinearGradientBrush x:Key="SuccessBrush" EndPoint="1,0" StartPoint="0,0">
-        <GradientStop Color="{DynamicResource SuccessColor}" Offset="0"/>
-        <GradientStop Color="{DynamicResource DarkSuccessColor}" Offset="1"/>
+    <LinearGradientBrush o:Freeze="True" x:Key="SuccessBrush" EndPoint="1,0" StartPoint="0,0">
+        <GradientStop o:Freeze="True" Color="{DynamicResource SuccessColor}" Offset="0"/>
+        <GradientStop o:Freeze="True" Color="{DynamicResource DarkSuccessColor}" Offset="1"/>
     </LinearGradientBrush>
-    <SolidColorBrush x:Key="DarkSuccessBrush" Color="{DynamicResource DarkSuccessColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="DarkSuccessBrush" Color="{DynamicResource DarkSuccessColor}"/>
 
-    <SolidColorBrush x:Key="AccentBrush" Color="{DynamicResource AccentColor}"/>
-    <SolidColorBrush x:Key="DarkAccentBrush" Color="{DynamicResource DarkAccentColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="AccentBrush" Color="{DynamicResource AccentColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="DarkAccentBrush" Color="{DynamicResource DarkAccentColor}"/>
 
-    <SolidColorBrush x:Key="DarkMaskBrush" Color="{DynamicResource DarkMaskColor}"/>
-    <SolidColorBrush x:Key="DarkOpacityBrush" Color="{DynamicResource DarkOpacityColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="DarkMaskBrush" Color="{DynamicResource DarkMaskColor}"/>
+    <SolidColorBrush o:Freeze="True" x:Key="DarkOpacityBrush" Color="{DynamicResource DarkOpacityColor}"/>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Basic/Effects.xaml b/src/Shared/HandyControl_Shared/Themes/Basic/Effects.xaml
index da3428ff..a48cb76a 100644
--- a/src/Shared/HandyControl_Shared/Themes/Basic/Effects.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Basic/Effects.xaml
@@ -1,13 +1,13 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
+                    xmlns:o="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
 
     <Color x:Key="EffectShadowColor">#AA000000</Color>
 
-    <DropShadowEffect x:Key="EffectShadow1" BlurRadius="5" ShadowDepth="1" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" po:Freeze="True" />
-    <DropShadowEffect x:Key="EffectShadow2" BlurRadius="8" ShadowDepth="1.5" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" po:Freeze="True" />
-    <DropShadowEffect x:Key="EffectShadow3" BlurRadius="14" ShadowDepth="4.5" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" po:Freeze="True" />
-    <DropShadowEffect x:Key="EffectShadow4" BlurRadius="25" ShadowDepth="8" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" po:Freeze="True" />
-    <DropShadowEffect x:Key="EffectShadow5" BlurRadius="35" ShadowDepth="13" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" po:Freeze="True" />
+    <DropShadowEffect x:Key="EffectShadow1" BlurRadius="5" ShadowDepth="1" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
+    <DropShadowEffect x:Key="EffectShadow2" BlurRadius="8" ShadowDepth="1.5" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
+    <DropShadowEffect x:Key="EffectShadow3" BlurRadius="14" ShadowDepth="4.5" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
+    <DropShadowEffect x:Key="EffectShadow4" BlurRadius="25" ShadowDepth="8" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
+    <DropShadowEffect x:Key="EffectShadow5" BlurRadius="35" ShadowDepth="13" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Basic/Geometries.xaml b/src/Shared/HandyControl_Shared/Themes/Basic/Geometries.xaml
index 58fe7055..7d375239 100644
--- a/src/Shared/HandyControl_Shared/Themes/Basic/Geometries.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Basic/Geometries.xaml
@@ -1,44 +1,45 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:o="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
 
-    <Geometry x:Key="CalendarGeometry">M377.897477 116.291025l265.298718 0 0 47.459125-265.298718 0 0-47.459125ZM888.317416 116.291025 748.229288 116.291025l0 47.459125 123.54866 0c18.167626 0 32.894732 14.727106 32.894732 32.894732l0 92.92987L115.42936 289.574752l0-92.92987c0-18.167626 14.727106-32.894732 32.894732-32.894732l123.54866 0 0-47.459125L131.776437 116.291025c-35.244356 0-63.814389 28.571056-63.814389 63.815412l0.004093 713.966329c0 35.243333 28.571056 63.814389 63.814389 63.814389l756.540979 0c35.244356 0 63.814389-28.571056 63.814389-63.815412l-0.004093-713.966329C952.131805 144.861058 923.560749 116.291025 888.317416 116.291025zM904.67268 337.033877l0 540.498398c0 18.167626-14.727106 32.894732-32.894732 32.894732L148.324092 910.427007c-18.167626 0-32.894732-14.727106-32.894732-32.894732L115.42936 337.033877 904.67268 337.033877zM300.659736 64.801927l47.459125 0 0 170.241292-47.459125 0 0-170.241292ZM672.97481 64.801927l47.450938 0 0 170.241292-47.450938 0 0-170.241292ZM358.384138 547.939214l0 231.021432 52.863464 0L411.247602 459.226591l-34.580198 0-2.651514 3.804835c-18.000819 25.896006-41.448959 48.758786-69.681285 67.955908l-3.886703 2.643327 0 53.742526 13.441772-8.069156C330.690097 569.215794 345.588103 558.712075 358.384138 547.939214zM618.031888 726.552576c-10.287791 6.395971-24.435678 8.069156-42.059902 4.948946-16.094309-2.842881-27.898712-18.373321-35.082666-46.159464l-2.261615-8.753781-48.312603 13.424375 1.68956 8.129534c6.270098 30.168514 18.347737 52.052967 35.884976 65.017855 17.120734 12.705979 35.542152 19.777364 54.731087 21.043255 3.358652 0.225138 6.655903 0.337707 9.897892 0.337707 14.859119 0 28.430857-2.374184 40.452211-7.072408 14.417029-5.641758 26.88866-13.338413 37.076162-22.86278 10.365566-9.723922 18.230051-22.143362 23.378552-36.920612 4.918246-14.170401 7.739636-28.296797 8.385373-42.025108 0.60685-13.658723-0.667228-26.650218-3.791531-38.619382l-0.008187-0.017397c-3.111-11.777796-8.133628-23.738773-14.946104-35.551363-7.353831-12.679372-19.028268-22.750211-34.710165-29.952586-15.037183-6.872854-30.927843-10.685876-47.24729-11.32752-11.414505-0.415482-23.487027 1.386646-36.04462 5.434017 3.813022-14.568486 7.648557-31.884681 11.465673-51.775637l113.87693 0 0-49.357449L535.645647 464.492778l-1.495122 7.028404c-24.621928 115.77116-31.589954 145.497585-33.102473 150.039235l-3.432334 10.338958 45.829943 5.391036 3.054716-4.20292c8.146931-11.214951 18.247448-18.139996 30.879746-21.164011 13.004799-3.137607 24.743707-3.180588 34.879018-0.129966 9.857981 2.95545 17.822756 8.771178 24.327202 17.758284 6.512633 9.03111 10.084143 20.392401 10.617311 33.757421 0.519864 13.849067-1.603598 26.442477-6.314102 37.440476C636.315153 711.429431 628.843637 719.871089 618.031888 726.552576z</Geometry>
-    <Geometry x:Key="DeleteGeometry">M512 620.544l253.3376 253.3376a76.6976 76.6976 0 1 0 108.544-108.544L620.6464 512l253.2352-253.3376a76.6976 76.6976 0 1 0-108.544-108.544L512 403.3536 258.6624 150.1184a76.6976 76.6976 0 1 0-108.544 108.544L403.3536 512 150.1184 765.3376a76.6976 76.6976 0 1 0 108.544 108.544L512 620.6464z</Geometry>
-    <Geometry x:Key="DeleteFillCircleGeometry">M7.4038057,6.4038057 C7.1478834,6.4038057 6.8919611,6.5014372 6.6966991,6.6966991 6.3061748,7.0872235 6.3061748,7.7203884 6.6966991,8.1109123 L10.585787,12 6.6966991,15.889088 C6.3061748,16.279612 6.3061748,16.912777 6.6966991,17.303301 7.0872235,17.693825 7.7203879,17.693825 8.1109123,17.303301 L12,13.414213 15.889088,17.303301 C16.279612,17.693825 16.912777,17.693825 17.303301,17.303301 17.693825,16.912777 17.693825,16.279612 17.303301,15.889088 L13.414213,12 17.303301,8.1109123 C17.693825,7.7203884 17.693825,7.0872235 17.303301,6.6966991 16.912777,6.3061748 16.279612,6.3061748 15.889088,6.6966991 L12,10.585787 8.1109123,6.6966991 C7.9156504,6.5014372 7.6597281,6.4038057 7.4038057,6.4038057 z M12,0 C18.627417,0 24,5.3725829 24,12 24,18.627417 18.627417,24 12,24 5.3725829,24 0,18.627417 0,12 0,5.3725829 5.3725829,0 12,0 z</Geometry>
-    <Geometry x:Key="CloseGeometry">M0.7,0 L5,4.3 L9.3,0 L10,0.7 L5.7,5 L10,9.3 L9.3,10 L5,5.7 L0.7,10 L0,9.3 L4.3,5 L0,0.7 z</Geometry>
-    <Geometry x:Key="DownGeometry">M512 801.6896L5.12 282.0096l58.1632-59.5968L512 682.3936l448.7168-460.0832 58.1632 59.5968-506.88 519.7824z</Geometry>
-    <Geometry x:Key="UpGeometry">M50.000001,0 L100,51.262779 94.262627,57.141584 50.000001,11.767713 5.7373757,57.151686 0,51.27288 z</Geometry>
-    <Geometry x:Key="ClockGeometry">M498.506684 256.571517 425.359734 256.571517 425.359734 622.190635 720.166063 622.190635 720.166063 549.725206 498.506684 549.725206ZM512.714268 80.162738c-245.740844 0-445.181175 197.577914-445.181175 441.024505s199.439308 441.024505 445.181175 441.024505c245.738797 0 445.178105-197.577914 445.178105-441.024505S758.453065 80.162738 512.714268 80.162738zM512.714268 874.005824c-195.880249 0-356.145349-158.768003-356.145349-352.818581s160.2651-352.821651 356.145349-352.821651c195.877179 0 356.14228 158.77005 356.14228 352.821651S708.591447 874.005824 512.714268 874.005824z</Geometry>
-    <Geometry x:Key="LeftGeometry">M394.24 512L683.52 248.32c10.24-10.24 10.24-25.6 0-35.84-10.24-10.24-25.6-10.24-35.84 0l-307.2 279.04c-5.12 5.12-7.68 12.8-7.68 20.48 0 7.68 2.56 15.36 7.68 20.48l307.2 279.04c10.24 10.24 25.6 10.24 35.84 0 10.24-10.24 10.24-25.6 0-35.84L394.24 512z</Geometry>
-    <Geometry x:Key="RightGeometry">M4.1666641,0 C5.2083321,0 6.25,0.41666794 7.0833321,1.25 L57.083331,46.666664 C57.916664,47.499998 58.33333,48.749998 58.333329,49.999998 58.33333,51.249997 57.916664,52.499997 57.083331,53.333331 L7.0833321,98.749996 C5.4166641,100.41666 2.9166641,100.41666 1.2499962,98.749996 -0.41666794,97.083328 -0.41666794,94.583328 1.2499962,92.916664 L48.333331,49.999998 1.2499962,7.0833321 C-0.41666794,5.4166641 -0.41666794,2.9166641 1.2499962,1.25 2.0833282,0.41666794 3.1249962,0 4.1666641,0 z</Geometry>
-    <Geometry x:Key="RotateLeftGeometry">M165.238899 508.178506C164.450369 456.442676 171.767779 404.485842 187.244542 353.863631 266.138632 95.812692 533.436225-51.353028 784.380224 25.368251 1035.324219 102.08953 1174.62994 373.566359 1095.735851 631.617298 1016.84176 889.66824 749.544168 1036.833959 498.600172 960.11268 424.134741 937.346313 357.837833 896.870788 303.973868 842.276436 291.310328 829.441176 291.396506 808.495802 304.166356 795.493625 316.936205 782.491452 337.554042 782.356136 350.217582 795.191397 396.640587 842.243889 453.73137 877.098901 517.975091 896.740177 734.436966 962.919213 965.320335 835.802028 1033.557737 612.607541 1101.795139 389.413057 981.467179 154.919792 765.005305 88.740755 548.543428 22.561718 317.660056 149.678904 249.422655 372.873388 235.597198 418.094418 229.294871 464.461039 230.4403 510.559881L311.240978 429.759202C323.584094 417.416085 343.892513 417.712357 356.601099 430.420946 369.309686 443.129535 369.605959 463.437952 357.262842 475.781068L230.778782 602.265128C229.273826 605.769679 227.098877 609.041396 224.251145 611.889128 211.908029 624.232245 191.59961 623.935974 178.891024 611.227385L40.825428 473.16179C28.11684 460.453206 27.820569 440.144784 40.163685 427.801668 52.506801 415.458551 72.815218 415.754827 85.523806 428.463411L165.238899 508.178506Z</Geometry>
-    <Geometry x:Key="EnlargeGeometry">M750.3 198.7C598 46.4 351.1 46.4 198.7 198.7s-152.3 399.2 0 551.5C345.1 896.6 578.8 902.3 732 767.3l172.1 172.1 35.4-35.4-172.1-171.9c135-153.2 129.3-387-17.1-533.4z m39.3 403.8c-17.1 42.1-42.2 80-74.7 112.4-32.5 32.5-70.3 57.6-112.4 74.7-40.7 16.5-83.8 24.9-128 24.9s-87.2-8.4-128-24.9c-42.1-17.1-80-42.2-112.4-74.7s-57.6-70.3-74.7-112.4c-16.5-40.7-24.9-83.8-24.9-128s8.4-87.2 24.9-128c17.1-42.1 42.2-80 74.7-112.4s70.3-57.6 112.4-74.7c40.7-16.5 83.8-24.9 128-24.9s87.2 8.4 128 24.9c42.1 17.1 80 42.2 112.4 74.7 32.5 32.5 57.6 70.3 74.7 112.4 16.5 40.7 24.9 83.8 24.9 128s-8.4 87.3-24.9 128zM671 502H496v175h-50V502H271v-50h175V277h50v175h175v50z</Geometry>
-    <Geometry x:Key="ReduceGeometry">M750.3 198.7C598 46.4 351.1 46.4 198.7 198.7s-152.3 399.2 0 551.5C345.1 896.6 578.8 902.3 732 767.3l172.1 172.1 35.4-35.4-172.1-171.9c135-153.2 129.3-387-17.1-533.4z m39.3 403.8c-17.1 42.1-42.2 80-74.7 112.4-32.5 32.5-70.3 57.6-112.4 74.7-40.7 16.5-83.8 24.9-128 24.9s-87.2-8.4-128-24.9c-42.1-17.1-80-42.2-112.4-74.7s-57.6-70.3-74.7-112.4c-16.5-40.7-24.9-83.8-24.9-128s8.4-87.2 24.9-128c17.1-42.1 42.2-80 74.7-112.4s70.3-57.6 112.4-74.7c40.7-16.5 83.8-24.9 128-24.9s87.2 8.4 128 24.9c42.1 17.1 80 42.2 112.4 74.7 32.5 32.5 57.6 70.3 74.7 112.4 16.5 40.7 24.9 83.8 24.9 128s-8.4 87.3-24.9 128zM671 502H271v-50h400v50z</Geometry>
-    <Geometry x:Key="DownloadGeometry">M868.100096 742.600704l-0.049152 0L216.246272 742.600704l-0.049152 0c-13.98784 0-25.327616 11.33568-25.327616 25.352192 0 13.993984 11.360256 25.327616 25.327616 25.327616l0.049152 0 651.804672 0 0.049152 0c13.996032 0 25.33376-11.333632 25.33376-25.327616C893.431808 753.936384 882.096128 742.600704 868.100096 742.600704L868.100096 742.600704 868.100096 742.600704M523.15136 688.433152c4.728832 4.757504 11.237376 7.733248 18.47296 7.733248l0 0 0 0c7.231488 0 13.740032-2.951168 18.42176-7.757824l314.836992-314.83904c4.732928-4.704256 7.714816-11.214848 7.7312-18.395136 0-14.342144-11.712512-25.9584-25.972736-25.9584-7.213056-0.02048-13.694976 2.930688-18.376704 7.636992L567.578624 607.51872 567.578624 117.52448c-0.024576-0.026624-0.024576-0.026624-0.024576-0.0512 0.024576-14.344192-11.59168-25.980928-25.901056-25.980928-14.348288 0-25.960448 11.634688-25.960448 25.980928 0 0 0 0.024576 0.024576 0.0512l0 489.967616L245.055488 336.826368c-4.683776-4.704256-11.2128-7.6288-18.374656-7.60832-14.342144-0.02048-25.954304 11.614208-26.005504 25.9072 0 7.20896 2.951168 13.768704 7.684096 18.423808L523.15136 688.433152 523.15136 688.433152 523.15136 688.433152M523.15136 688.433152 523.15136 688.433152z</Geometry>
-    <Geometry x:Key="SaveGeometry">M608 320C625.664 320 640 305.696 640 288L640 160C640 142.304 625.664 128 608 128 590.336 128 576 142.304 576 160L576 288C576 305.696 590.336 320 608 320L608 320ZM960 896C960 931.328 931.328 960 896 960L128 960C92.672 960 64 931.328 64 896L64 128C64 92.672 92.672 64 128 64L192 64 192 384C192 419.328 220.672 448 256 448L768 448C803.328 448 832 419.328 832 384L832 64 896 64C931.328 64 960 92.672 960 128L960 896 960 896ZM256 64 768 64 768 352C768 369.696 753.664 384 736 384L288 384C270.336 384 256 369.696 256 352L256 64 256 64ZM896 0 128 0C57.312 0 0 57.312 0 128L0 896C0 966.688 57.312 1024 128 1024L896 1024C966.688 1024 1024 966.688 1024 896L1024 128C1024 57.312 966.688 0 896 0L896 0Z</Geometry>
-    <Geometry x:Key="WindowsGeometry">M426.276571 574.829714l0 372.004571-389.705143-53.686857 0-318.317714 389.705143 0zM426.276571 150.308571l0 376.539429-389.705143 0 0-322.852571zM987.428571 574.829714l0 449.170286-518.290286-71.460571 0-377.709714 518.290286 0zM987.428571 73.142857l0 453.705143-518.290286 0 0-382.317714z</Geometry>
-    <Geometry x:Key="FullScreenGeometry">M942 82v320h-50V167.4l-274 274-35.4-35.4 274-274H622V82h320zM406 582.6l-274 274V622H82v320h320v-50H167.4l274-274-35.4-35.4zM132 132h302V82H82v352h50V132z m760 760H590v50h352V590h-50v302z</Geometry>
-    <Geometry x:Key="FullScreenReturnGeometry">M94.186081,59.07 L100,59.07 100,100 59.07,100 59.07,94.186081 94.186081,94.186081 z M4.5814285,58.208999 L41.791,58.208999 41.791,95.418571 35.977005,95.418571 35.977005,68.139304 4.1163101,100 0,95.88369 31.860695,64.022995 4.5814285,64.022995 z M95.88369,0 L100,4.1163101 68.139304,35.977005 95.418571,35.977005 95.418571,41.791 58.208999,41.791 58.208999,4.5814285 64.022995,4.5814285 64.022995,31.860695 z M0,0 L40.929998,0 40.929998,5.8139191 5.8139191,5.8139191 5.8139191,40.929998 0,40.929998 z</Geometry>
-    <Geometry x:Key="SearchGeometry">M716.6003 213.800623c-138.851102-138.915088-364.020238-138.915088-502.935326 0s-138.915088 364.084225 0 502.935326a355.573996 355.573996 0 0 0 502.935326 0 355.573996 355.573996 0 0 0 0-502.935326z m-580.359212 580.359212a465.183184 465.183184 0 1 1 657.783099 0 465.183184 465.183184 0 0 1-657.783099 0z m868.939152 211.156054a63.474789 63.474789 0 0 1-89.837303 0l-89.773316-89.837303a63.410803 63.410803 0 1 1 89.773316-89.773316l89.837303 89.773316a63.346816 63.346816 0 0 1 0 89.837303z</Geometry>
-    <Geometry x:Key="UpDownGeometry">M454.464 143.68l-253.44 253.44c-12.032 12.032-12.032 31.36 0 43.392 11.968 11.968 31.36 11.968 43.328 0l237.376-237.376 237.376 237.376c11.968 11.968 31.36 11.968 43.328 0 12.032-12.032 12.032-31.36 0-43.392l-253.44-253.44C491.264 126.016 478.016 124.032 454.464 143.68zM507.968 947.648l252.48-253.376c11.968-11.968 11.968-31.36 0-43.392-11.968-11.968-31.296-11.968-43.264 0l-236.48 237.376L244.16 650.88c-11.968-11.968-31.296-11.968-43.264 0-11.968 12.032-11.968 31.424 0 43.392l252.48 253.376C465.984 960 491.136 964.48 507.968 947.648z</Geometry>
-    <Geometry x:Key="WindowMinGeometry">M0,4 L10,4 L10,5 L0,5 z</Geometry>
-    <Geometry x:Key="CheckedGeometry">M 0,2 3,5 8,0</Geometry>
-    <Geometry x:Key="EyeOpenGeometry">M928 406.4c-100.8-137.6-249.6-224-416-224s-315.2 86.4-416 224c-44.8 60.8-44.8 150.4 0 211.2 102.4 137.6 251.2 224 416 224 166.4 0 315.2-86.4 416-224 46.4-60.8 46.4-150.4 0-211.2zM512 721.6c-115.2 0-209.6-94.4-209.6-209.6 0-115.2 94.4-209.6 209.6-209.6 115.2 0 209.6 94.4 209.6 209.6 1.6 115.2-92.8 209.6-209.6 209.6z m0-360c-83.2 0-150.4 67.2-150.4 150.4s67.2 150.4 150.4 150.4 150.4-67.2 150.4-150.4-67.2-150.4-150.4-150.4z m0 0</Geometry>
-    <Geometry x:Key="EyeCloseGeometry">M950.4 361.6c8-20.8 0-43.2-19.2-54.4-9.6-4.8-20.8-6.4-32-3.2s-19.2 11.2-24 22.4c-56 132.8-208 228.8-361.6 228.8-155.2 0-307.2-97.6-363.2-232-4.8-11.2-12.8-19.2-24-24-9.6-4.8-20.8-3.2-32 0-20.8 9.6-30.4 35.2-20.8 56 25.6 60.8 67.2 118.4 123.2 164.8l-67.2 70.4c-14.4 16-14.4 40 0 57.6 8 8 17.6 14.4 28.8 14.4s22.4-3.2 30.4-11.2l76.8-81.6c35.2 20.8 73.6 38.4 113.6 49.6l-28.8 83.2c-8 22.4 3.2 46.4 24 54.4 4.8 1.6 9.6 3.2 14.4 3.2 6.4 0 11.2-1.6 17.6-3.2 9.6-4.8 17.6-12.8 22.4-24l33.6-96c41.6 4.8 81.6 3.2 123.2-3.2l32 94.4c3.2 11.2 11.2 19.2 22.4 24 9.6 4.8 20.8 4.8 32 1.6 20.8-8 32-32 24-54.4l-28.8-84.8c30.4-9.6 59.2-22.4 86.4-38.4l62.4 65.6c14.4 16 43.2 16 57.6 0 16-16 16-43.2 0-60.8l-51.2-54.4c56-43.2 100.8-100.8 128-164.8z</Geometry>
-    <Geometry x:Key="WindowRestoreGeometry">M1,3 L1,9 L7,9 L7,3 z M3,1 L3,2 L8,2 L8,7 L9,7 L9,1 z M2,0 L10,0 L10,8 L8,8 L8,10 L0,10 L0,2 L2,2 z</Geometry>
-    <Geometry x:Key="WindowMaxGeometry">M1,1 L1,9 L9,9 L9,1 z M0,0 L10,0 L10,10 L0,10 z</Geometry>
-    <Geometry x:Key="AudioGeometry">M627.52666696 962L550.66666696 890.47999971c116.82-92.99999971 191.09999971-230.94 191.09999971-385.2 0-146.99999971-67.61999971-279-174.96-371.57999942L643.84666667 62C770.86666638 172.99999971 850.66666667 330.2 850.66666667 505.09999971c0 182.27999971-86.58 345.42-223.13999971 456.90000029zM405.64666638 782l-76.32-77.22a227.88 227.88 0 0 0 116.40000058-199.26A228.06 228.06 0 0 0 347.86666638 317.84000029L422.86666696 242A334.37999971 334.37999971 0 0 1 550.66666696 505.52 334.62 334.62 0 0 1 405.64666638 782zM205.66666638 596.6C164.26666638 596.6 130.66666667 562.51999971 130.66666667 520.64 130.66666667 478.76000029 164.26666638 444.79999971 205.66666638 444.79999971s74.99999971 33.95999971 75.00000058 75.90000058c0 41.87999971-33.59999971 75.84000029-75.00000058 75.83999942z</Geometry>
-    <Geometry x:Key="BubbleTailGeometry">M0,0L28,0 28,14.0000006258488 28,15.0010000765324 28.0151405334473,15.0010000765324 28.0455417633057,15.8010965883732C28.4084091186524,22.9596563875675,30.92209815979,29.5507589876652,34.9532623291016,34.9410597383976L34.9984359741211,34.9999815523624 34.0966339111328,34.9885679781437C15.1841707229614,34.5094191133976,2.0535663480814E-07,19.0279375612736,0,0z</Geometry>
-    <Geometry x:Key="StarGeometry">M535.9 165.2l96.5 195.4c3.9 7.9 11.4 13.3 20.1 14.6l215.7 31.3c21.9 3.2 30.6 30 14.8 45.5L726.8 604.1c-6.3 6.1-9.1 14.9-7.7 23.6L756 842.5c3.7 21.8-19.1 38.4-38.7 28.1L524.4 769.2c-7.8-4.1-17-4.1-24.8 0L306.7 870.6c-19.6 10.3-42.4-6.3-38.7-28.1l36.8-214.8c1.5-8.6-1.4-17.5-7.7-23.6L141.1 452c-15.8-15.4-7.1-42.3 14.8-45.5l215.7-31.3c8.7-1.3 16.2-6.7 20.1-14.6l96.5-195.4c9.7-19.9 37.9-19.9 47.7 0z</Geometry>
-    <Geometry x:Key="AddGeometry">M938.666667 426.666667h-341.333334V85.333333c0-46.933333-38.4-85.333333-85.333333-85.333333s-85.333333 38.4-85.333333 85.333333v341.333334H85.333333c-46.933333 0-85.333333 38.4-85.333333 85.333333s38.4 85.333333 85.333333 85.333333h341.333334v341.333334c0 46.933333 38.4 85.333333 85.333333 85.333333s85.333333-38.4 85.333333-85.333333v-341.333334h341.333334c46.933333 0 85.333333-38.4 85.333333-85.333333s-38.4-85.333333-85.333333-85.333333z</Geometry>
-    <Geometry x:Key="SubGeometry">M62.5797 488.9508c0.2632 42.5185 34.985 77.2116 77.5035 77.5035l743.0216-0.6728c42.5185 0.3215 76.7437-33.9333 76.4518-76.4805l0 0c-0.2918-42.5175-34.985-77.2106-77.5045-77.5035l-743.0216-0.087C96.513 411.4473 62.2879 446.4323 62.5797 488.9508L62.5797 488.9508z</Geometry>
-    <Geometry x:Key="WarningGeometry">M943.644188 827.215696l-351.176649-608.204749c-42.945473-74.36249-113.147387-74.36249-156.092861 0l-351.176649 608.204749c-42.946498 74.431167-7.811716 135.14955 78.012605 135.14955l702.420949 0C951.455904 962.36422 986.555836 901.645838 943.644188 827.215696zM466.187532 391.579035c12.621133-13.644108 28.66175-20.466675 48.233578-20.466675 19.580028 0 35.612444 6.75389 48.241778 20.194018 12.544256 13.473954 18.820484 30.325365 18.820484 50.587035 0 17.430551-26.19759 145.621205-34.929778 238.882082l-63.105666 0c-7.666162-93.259852-36.090106-221.450507-36.090106-238.882082C447.358847 421.938226 453.643275 405.155491 466.187532 391.579035zM561.76804 835.026386c-13.268949 12.928641-29.062535 19.375023-47.345906 19.375023-18.275171 0-34.076957-6.447407-47.346931-19.375023-13.235123-12.89379-19.818859-28.517221-19.818859-46.869269 0-18.249546 6.583736-34.043131 19.818859-47.278254 13.268949-13.235123 29.07176-19.852685 47.346931-19.852685 18.283371 0 34.076957 6.617562 47.345906 19.852685 13.235123 13.235123 19.827059 29.028709 19.827059 47.278254C581.595099 806.51019 575.003163 822.132597 561.76804 835.026386z</Geometry>
-    <Geometry x:Key="InfoGeometry">M505.6512 39.0144c-261.2224 3.4816-470.1184 218.112-466.6368 479.4368 3.4816 261.12 218.112 470.1184 479.3344 466.6368 261.2224-3.4816 470.1184-218.112 466.7392-479.3344C981.504 244.4288 766.8736 35.5328 505.6512 39.0144zM558.08 196.608c48.128 0 62.2592 27.9552 62.2592 59.8016 0 39.8336-31.9488 76.6976-86.3232 76.6976-45.568 0-67.1744-22.9376-65.9456-60.8256C468.0704 240.4352 494.7968 196.608 558.08 196.608zM434.7904 807.6288c-32.8704 0-56.9344-19.968-33.8944-107.6224l37.6832-155.5456c6.5536-24.8832 7.68-34.9184 0-34.9184-9.8304 0-52.5312 17.2032-77.7216 34.2016l-16.384-26.9312c79.9744-66.7648 171.8272-105.8816 211.2512-105.8816 32.8704 0 38.2976 38.912 21.9136 98.6112l-43.2128 163.5328c-7.68 28.8768-4.4032 38.912 3.2768 38.912 9.9328 0 42.1888-11.9808 73.9328-36.9664l18.6368 24.8832C552.5504 777.728 467.6608 807.6288 434.7904 807.6288z</Geometry>
-    <Geometry x:Key="ErrorGeometry">M495.469714 0C224.621714 0 0 224.621714 0 495.469714c0 270.884571 224.621714 495.506286 495.469714 495.506286 270.884571 0 495.506286-224.621714 495.506286-495.506286C990.976 224.621714 766.354286 0 495.469714 0z m211.419429 634.221714c19.821714 19.821714 19.821714 46.226286 0 66.048s-46.226286 19.821714-66.048 0l-138.752-138.715428-145.334857 145.334857a51.858286 51.858286 0 0 1-72.667429 0 51.858286 51.858286 0 0 1 0-72.667429l145.334857-145.334857-138.752-138.752c-19.821714-19.821714-19.821714-46.226286 0-66.048s46.262857-19.821714 66.084572 0l138.715428 138.715429 145.371429-145.334857a51.858286 51.858286 0 0 1 72.667428 0 51.858286 51.858286 0 0 1 0 72.667428l-145.371428 145.334857 138.752 138.752z</Geometry>
-    <Geometry x:Key="SuccessGeometry">M512.66048 64.64c-247.424 0-448 200.57728-448 448s200.576 448 448 448 448-200.57728 448-448c0-247.424-200.57728-448-448-448z m250.71232 334.86336L480.98176 681.89312c-15.49568 15.49696-40.61952 15.49696-56.11648 0l-162.9184-162.9184c-15.49568-15.49568-15.49568-40.61824 0-56.1152s40.61952-15.49568 56.11648 0l134.85952 134.85952L707.25504 343.3856c15.49568-15.49568 40.61952-15.49568 56.11648 0s15.49696 40.6208 0.00128 56.11776z</Geometry>
-    <Geometry x:Key="FatalGeometry">M716.8 375.466667l34.133333 34.133333c17.066667 17.066667 42.666667 17.066667 59.733334 0 17.066667-17.066667 17.066667-42.666667 0-59.733333l-34.133334-34.133334 34.133334-34.133333c17.066667-17.066667 17.066667-42.666667 0-59.733333-17.066667-17.066667-42.666667-17.066667-59.733334 0l-34.133333 34.133333-34.133333-34.133333c-17.066667-17.066667-42.666667-17.066667-59.733334 0-17.066667 17.066667-17.066667 42.666667 0 59.733333l34.133334 34.133333-34.133334 34.133334c-17.066667 17.066667-17.066667 42.666667 0 59.733333 17.066667 17.066667 42.666667 17.066667 59.733334 0l34.133333-34.133333z m-426.666667 0l34.133334 34.133333c17.066667 17.066667 42.666667 17.066667 59.733333 0 17.066667-17.066667 17.066667-42.666667 0-59.733333l-34.133333-34.133334 34.133333-34.133333c17.066667-17.066667 17.066667-42.666667 0-59.733333-17.066667-17.066667-42.666667-17.066667-59.733333 0l-34.133334 34.133333-34.133333-34.133333c-17.066667-17.066667-42.666667-17.066667-59.733333 0-17.066667 17.066667-17.066667 42.666667 0 59.733333l34.133333 34.133333-34.133333 34.133334c-17.066667 17.066667-17.066667 42.666667 0 59.733333 17.066667 17.066667 42.666667 17.066667 59.733333 0l34.133333-34.133333zM0 85.333333c0-51.2 42.666667-85.333333 85.333333-85.333333h853.333334c51.2 0 85.333333 42.666667 85.333333 85.333333v853.333334c0 51.2-42.666667 85.333333-85.333333 85.333333H85.333333c-51.2 0-85.333333-42.666667-85.333333-85.333333V85.333333z m512 469.333334c-136.533333 0-230.4 68.266667-290.133333 196.266666-8.533333 17.066667 0 42.666667 17.066666 59.733334s42.666667 0 59.733334-17.066667c51.2-93.866667 110.933333-145.066667 221.866666-145.066667 102.4 0 170.666667 51.2 221.866667 145.066667 8.533333 17.066667 34.133333 25.6 59.733333 17.066667 17.066667-8.533333 25.6-34.133333 17.066667-59.733334-76.8-128-170.666667-196.266667-307.2-196.266666z</Geometry>
-    <Geometry x:Key="AskGeometry">M512 0 30.11843 240.941297l0 542.117406 481.88157 240.941297 481.88157-240.941297L993.88157 240.941297 512 0zM575.776472 768.799969 460.188012 768.799969 460.188012 656.222073l115.588459 0L575.776472 768.799969zM623.335603 509.329685c-52.375829 36.723353-59.600363 55.988096-59.600363 84.885211l0 19.866447L468.616977 614.081343l0-26.489278c0-45.754021 13.846342-80.67124 61.406497-116.791866 46.957428-36.723353 57.79423-62.0082 57.79423-84.282484 0-25.284848-21.67258-54.181962-55.386393-54.181962-42.743457 0-70.436142 26.489278-82.477374 85.486914l-105.956088-21.67258c24.683144-111.976192 82.477374-157.127486 205.289345-157.127486 98.12985 0 157.72919 63.212631 157.72919 131.842639C707.017407 423.240044 688.956071 461.76953 623.335603 509.329685z</Geometry>
-    <Geometry x:Key="AllGeometry">M 721.005 638.949 C 758.74 638.949 789.333 669.56 789.333 707.312 C 789.333 745.047 758.74 775.657 721.005 775.657 C 683.253 775.657 652.66 745.047 652.66 707.312 C 652.66 669.56 683.253 638.949 721.005 638.949 Z M 512.017 638.949 C 549.77 638.949 580.38 669.56 580.38 707.312 C 580.38 745.047 549.77 775.657 512.017 775.657 C 474.265 775.657 443.672 745.047 443.672 707.312 C 443.672 669.56 474.265 638.949 512.017 638.949 Z M 303.029 638.949 C 340.781 638.949 371.392 669.56 371.392 707.312 C 371.392 745.047 340.781 775.657 303.029 775.657 C 265.277 775.657 234.667 745.047 234.667 707.312 C 234.667 669.56 265.277 638.949 303.029 638.949 Z M 721.005 443.655 C 758.74 443.655 789.333 474.265 789.333 512.017 C 789.333 549.769 758.74 580.363 721.005 580.363 C 683.253 580.363 652.66 549.769 652.66 512.017 C 652.66 474.265 683.253 443.655 721.005 443.655 Z M 512.017 443.655 C 549.77 443.655 580.38 474.265 580.38 512.017 C 580.38 549.769 549.77 580.363 512.017 580.363 C 474.265 580.363 443.672 549.769 443.672 512.017 C 443.672 474.265 474.265 443.655 512.017 443.655 Z M 303.029 443.655 C 340.781 443.655 371.392 474.265 371.392 512.017 C 371.392 549.769 340.781 580.363 303.029 580.363 C 265.277 580.363 234.667 549.769 234.667 512.017 C 234.667 474.265 265.277 443.655 303.029 443.655 Z M 721.005 248.343 C 758.74 248.343 789.333 278.953 789.333 316.688 C 789.333 354.44 758.74 385.051 721.005 385.051 C 683.253 385.051 652.66 354.44 652.66 316.688 C 652.66 278.953 683.253 248.343 721.005 248.343 Z M 512.017 248.343 C 549.77 248.343 580.38 278.953 580.38 316.688 C 580.38 354.44 549.77 385.051 512.017 385.051 C 474.265 385.051 443.672 354.44 443.672 316.688 C 443.672 278.953 474.265 248.343 512.017 248.343 Z M 303.029 248.343 C 340.781 248.343 371.392 278.953 371.392 316.688 C 371.392 354.44 340.781 385.051 303.029 385.051 C 265.277 385.051 234.667 354.44 234.667 316.688 C 234.667 278.953 265.277 248.343 303.029 248.343 Z</Geometry>
-    <Geometry x:Key="DragGeometry">M384 896C384 825.307552 440.814697 768 512 768 582.692448 768 640 824.814694 640 896 640 966.692448 583.185303 1024 512 1024 441.307552 1024 384 967.185306 384 896ZM384 512C384 441.307552 440.814697 384 512 384 582.692448 384 640 440.814697 640 512 640 582.692448 583.185303 640 512 640 441.307552 640 384 583.185303 384 512ZM384 128C384 57.307552 440.814697 0 512 0 582.692448 0 640 56.814697 640 128 640 198.692448 583.185303 256 512 256 441.307552 256 384 199.185303 384 128Z</Geometry>
-    <Geometry x:Key="DropperGeometry">M798.165333 97.834667a42.624 42.624 0 0 0-60.330666 0l-140.629334 140.629333-55.381333-55.296-60.330667 60.330667 55.381334 55.296-353.706667 353.706666a42.709333 42.709333 0 0 0-11.221333 19.84l-42.666667 170.666667a42.538667 42.538667 0 0 0 51.712 51.712l170.666667-42.666667c7.509333-1.877333 14.378667-5.76 19.84-11.221333l353.792-353.792 55.210666 55.125333 60.330667-60.330666-55.210667-55.125334 140.544-140.544a42.624 42.624 0 0 0 0-60.330666l-128-128zM319.488 772.138667l-90.197333 22.570666 22.570666-90.197333 345.386667-345.386667 67.669333 67.584-345.429333 345.429334z</Geometry>
+    <Geometry o:Freeze="True" x:Key="CalendarGeometry">M377.897477 116.291025l265.298718 0 0 47.459125-265.298718 0 0-47.459125ZM888.317416 116.291025 748.229288 116.291025l0 47.459125 123.54866 0c18.167626 0 32.894732 14.727106 32.894732 32.894732l0 92.92987L115.42936 289.574752l0-92.92987c0-18.167626 14.727106-32.894732 32.894732-32.894732l123.54866 0 0-47.459125L131.776437 116.291025c-35.244356 0-63.814389 28.571056-63.814389 63.815412l0.004093 713.966329c0 35.243333 28.571056 63.814389 63.814389 63.814389l756.540979 0c35.244356 0 63.814389-28.571056 63.814389-63.815412l-0.004093-713.966329C952.131805 144.861058 923.560749 116.291025 888.317416 116.291025zM904.67268 337.033877l0 540.498398c0 18.167626-14.727106 32.894732-32.894732 32.894732L148.324092 910.427007c-18.167626 0-32.894732-14.727106-32.894732-32.894732L115.42936 337.033877 904.67268 337.033877zM300.659736 64.801927l47.459125 0 0 170.241292-47.459125 0 0-170.241292ZM672.97481 64.801927l47.450938 0 0 170.241292-47.450938 0 0-170.241292ZM358.384138 547.939214l0 231.021432 52.863464 0L411.247602 459.226591l-34.580198 0-2.651514 3.804835c-18.000819 25.896006-41.448959 48.758786-69.681285 67.955908l-3.886703 2.643327 0 53.742526 13.441772-8.069156C330.690097 569.215794 345.588103 558.712075 358.384138 547.939214zM618.031888 726.552576c-10.287791 6.395971-24.435678 8.069156-42.059902 4.948946-16.094309-2.842881-27.898712-18.373321-35.082666-46.159464l-2.261615-8.753781-48.312603 13.424375 1.68956 8.129534c6.270098 30.168514 18.347737 52.052967 35.884976 65.017855 17.120734 12.705979 35.542152 19.777364 54.731087 21.043255 3.358652 0.225138 6.655903 0.337707 9.897892 0.337707 14.859119 0 28.430857-2.374184 40.452211-7.072408 14.417029-5.641758 26.88866-13.338413 37.076162-22.86278 10.365566-9.723922 18.230051-22.143362 23.378552-36.920612 4.918246-14.170401 7.739636-28.296797 8.385373-42.025108 0.60685-13.658723-0.667228-26.650218-3.791531-38.619382l-0.008187-0.017397c-3.111-11.777796-8.133628-23.738773-14.946104-35.551363-7.353831-12.679372-19.028268-22.750211-34.710165-29.952586-15.037183-6.872854-30.927843-10.685876-47.24729-11.32752-11.414505-0.415482-23.487027 1.386646-36.04462 5.434017 3.813022-14.568486 7.648557-31.884681 11.465673-51.775637l113.87693 0 0-49.357449L535.645647 464.492778l-1.495122 7.028404c-24.621928 115.77116-31.589954 145.497585-33.102473 150.039235l-3.432334 10.338958 45.829943 5.391036 3.054716-4.20292c8.146931-11.214951 18.247448-18.139996 30.879746-21.164011 13.004799-3.137607 24.743707-3.180588 34.879018-0.129966 9.857981 2.95545 17.822756 8.771178 24.327202 17.758284 6.512633 9.03111 10.084143 20.392401 10.617311 33.757421 0.519864 13.849067-1.603598 26.442477-6.314102 37.440476C636.315153 711.429431 628.843637 719.871089 618.031888 726.552576z</Geometry>
+    <Geometry o:Freeze="True" x:Key="DeleteGeometry">M512 620.544l253.3376 253.3376a76.6976 76.6976 0 1 0 108.544-108.544L620.6464 512l253.2352-253.3376a76.6976 76.6976 0 1 0-108.544-108.544L512 403.3536 258.6624 150.1184a76.6976 76.6976 0 1 0-108.544 108.544L403.3536 512 150.1184 765.3376a76.6976 76.6976 0 1 0 108.544 108.544L512 620.6464z</Geometry>
+    <Geometry o:Freeze="True" x:Key="DeleteFillCircleGeometry">M7.4038057,6.4038057 C7.1478834,6.4038057 6.8919611,6.5014372 6.6966991,6.6966991 6.3061748,7.0872235 6.3061748,7.7203884 6.6966991,8.1109123 L10.585787,12 6.6966991,15.889088 C6.3061748,16.279612 6.3061748,16.912777 6.6966991,17.303301 7.0872235,17.693825 7.7203879,17.693825 8.1109123,17.303301 L12,13.414213 15.889088,17.303301 C16.279612,17.693825 16.912777,17.693825 17.303301,17.303301 17.693825,16.912777 17.693825,16.279612 17.303301,15.889088 L13.414213,12 17.303301,8.1109123 C17.693825,7.7203884 17.693825,7.0872235 17.303301,6.6966991 16.912777,6.3061748 16.279612,6.3061748 15.889088,6.6966991 L12,10.585787 8.1109123,6.6966991 C7.9156504,6.5014372 7.6597281,6.4038057 7.4038057,6.4038057 z M12,0 C18.627417,0 24,5.3725829 24,12 24,18.627417 18.627417,24 12,24 5.3725829,24 0,18.627417 0,12 0,5.3725829 5.3725829,0 12,0 z</Geometry>
+    <Geometry o:Freeze="True" x:Key="CloseGeometry">M0.7,0 L5,4.3 L9.3,0 L10,0.7 L5.7,5 L10,9.3 L9.3,10 L5,5.7 L0.7,10 L0,9.3 L4.3,5 L0,0.7 z</Geometry>
+    <Geometry o:Freeze="True" x:Key="DownGeometry">M512 801.6896L5.12 282.0096l58.1632-59.5968L512 682.3936l448.7168-460.0832 58.1632 59.5968-506.88 519.7824z</Geometry>
+    <Geometry o:Freeze="True" x:Key="UpGeometry">M50.000001,0 L100,51.262779 94.262627,57.141584 50.000001,11.767713 5.7373757,57.151686 0,51.27288 z</Geometry>
+    <Geometry o:Freeze="True" x:Key="ClockGeometry">M498.506684 256.571517 425.359734 256.571517 425.359734 622.190635 720.166063 622.190635 720.166063 549.725206 498.506684 549.725206ZM512.714268 80.162738c-245.740844 0-445.181175 197.577914-445.181175 441.024505s199.439308 441.024505 445.181175 441.024505c245.738797 0 445.178105-197.577914 445.178105-441.024505S758.453065 80.162738 512.714268 80.162738zM512.714268 874.005824c-195.880249 0-356.145349-158.768003-356.145349-352.818581s160.2651-352.821651 356.145349-352.821651c195.877179 0 356.14228 158.77005 356.14228 352.821651S708.591447 874.005824 512.714268 874.005824z</Geometry>
+    <Geometry o:Freeze="True" x:Key="LeftGeometry">M394.24 512L683.52 248.32c10.24-10.24 10.24-25.6 0-35.84-10.24-10.24-25.6-10.24-35.84 0l-307.2 279.04c-5.12 5.12-7.68 12.8-7.68 20.48 0 7.68 2.56 15.36 7.68 20.48l307.2 279.04c10.24 10.24 25.6 10.24 35.84 0 10.24-10.24 10.24-25.6 0-35.84L394.24 512z</Geometry>
+    <Geometry o:Freeze="True" x:Key="RightGeometry">M4.1666641,0 C5.2083321,0 6.25,0.41666794 7.0833321,1.25 L57.083331,46.666664 C57.916664,47.499998 58.33333,48.749998 58.333329,49.999998 58.33333,51.249997 57.916664,52.499997 57.083331,53.333331 L7.0833321,98.749996 C5.4166641,100.41666 2.9166641,100.41666 1.2499962,98.749996 -0.41666794,97.083328 -0.41666794,94.583328 1.2499962,92.916664 L48.333331,49.999998 1.2499962,7.0833321 C-0.41666794,5.4166641 -0.41666794,2.9166641 1.2499962,1.25 2.0833282,0.41666794 3.1249962,0 4.1666641,0 z</Geometry>
+    <Geometry o:Freeze="True" x:Key="RotateLeftGeometry">M165.238899 508.178506C164.450369 456.442676 171.767779 404.485842 187.244542 353.863631 266.138632 95.812692 533.436225-51.353028 784.380224 25.368251 1035.324219 102.08953 1174.62994 373.566359 1095.735851 631.617298 1016.84176 889.66824 749.544168 1036.833959 498.600172 960.11268 424.134741 937.346313 357.837833 896.870788 303.973868 842.276436 291.310328 829.441176 291.396506 808.495802 304.166356 795.493625 316.936205 782.491452 337.554042 782.356136 350.217582 795.191397 396.640587 842.243889 453.73137 877.098901 517.975091 896.740177 734.436966 962.919213 965.320335 835.802028 1033.557737 612.607541 1101.795139 389.413057 981.467179 154.919792 765.005305 88.740755 548.543428 22.561718 317.660056 149.678904 249.422655 372.873388 235.597198 418.094418 229.294871 464.461039 230.4403 510.559881L311.240978 429.759202C323.584094 417.416085 343.892513 417.712357 356.601099 430.420946 369.309686 443.129535 369.605959 463.437952 357.262842 475.781068L230.778782 602.265128C229.273826 605.769679 227.098877 609.041396 224.251145 611.889128 211.908029 624.232245 191.59961 623.935974 178.891024 611.227385L40.825428 473.16179C28.11684 460.453206 27.820569 440.144784 40.163685 427.801668 52.506801 415.458551 72.815218 415.754827 85.523806 428.463411L165.238899 508.178506Z</Geometry>
+    <Geometry o:Freeze="True" x:Key="EnlargeGeometry">M750.3 198.7C598 46.4 351.1 46.4 198.7 198.7s-152.3 399.2 0 551.5C345.1 896.6 578.8 902.3 732 767.3l172.1 172.1 35.4-35.4-172.1-171.9c135-153.2 129.3-387-17.1-533.4z m39.3 403.8c-17.1 42.1-42.2 80-74.7 112.4-32.5 32.5-70.3 57.6-112.4 74.7-40.7 16.5-83.8 24.9-128 24.9s-87.2-8.4-128-24.9c-42.1-17.1-80-42.2-112.4-74.7s-57.6-70.3-74.7-112.4c-16.5-40.7-24.9-83.8-24.9-128s8.4-87.2 24.9-128c17.1-42.1 42.2-80 74.7-112.4s70.3-57.6 112.4-74.7c40.7-16.5 83.8-24.9 128-24.9s87.2 8.4 128 24.9c42.1 17.1 80 42.2 112.4 74.7 32.5 32.5 57.6 70.3 74.7 112.4 16.5 40.7 24.9 83.8 24.9 128s-8.4 87.3-24.9 128zM671 502H496v175h-50V502H271v-50h175V277h50v175h175v50z</Geometry>
+    <Geometry o:Freeze="True" x:Key="ReduceGeometry">M750.3 198.7C598 46.4 351.1 46.4 198.7 198.7s-152.3 399.2 0 551.5C345.1 896.6 578.8 902.3 732 767.3l172.1 172.1 35.4-35.4-172.1-171.9c135-153.2 129.3-387-17.1-533.4z m39.3 403.8c-17.1 42.1-42.2 80-74.7 112.4-32.5 32.5-70.3 57.6-112.4 74.7-40.7 16.5-83.8 24.9-128 24.9s-87.2-8.4-128-24.9c-42.1-17.1-80-42.2-112.4-74.7s-57.6-70.3-74.7-112.4c-16.5-40.7-24.9-83.8-24.9-128s8.4-87.2 24.9-128c17.1-42.1 42.2-80 74.7-112.4s70.3-57.6 112.4-74.7c40.7-16.5 83.8-24.9 128-24.9s87.2 8.4 128 24.9c42.1 17.1 80 42.2 112.4 74.7 32.5 32.5 57.6 70.3 74.7 112.4 16.5 40.7 24.9 83.8 24.9 128s-8.4 87.3-24.9 128zM671 502H271v-50h400v50z</Geometry>
+    <Geometry o:Freeze="True" x:Key="DownloadGeometry">M868.100096 742.600704l-0.049152 0L216.246272 742.600704l-0.049152 0c-13.98784 0-25.327616 11.33568-25.327616 25.352192 0 13.993984 11.360256 25.327616 25.327616 25.327616l0.049152 0 651.804672 0 0.049152 0c13.996032 0 25.33376-11.333632 25.33376-25.327616C893.431808 753.936384 882.096128 742.600704 868.100096 742.600704L868.100096 742.600704 868.100096 742.600704M523.15136 688.433152c4.728832 4.757504 11.237376 7.733248 18.47296 7.733248l0 0 0 0c7.231488 0 13.740032-2.951168 18.42176-7.757824l314.836992-314.83904c4.732928-4.704256 7.714816-11.214848 7.7312-18.395136 0-14.342144-11.712512-25.9584-25.972736-25.9584-7.213056-0.02048-13.694976 2.930688-18.376704 7.636992L567.578624 607.51872 567.578624 117.52448c-0.024576-0.026624-0.024576-0.026624-0.024576-0.0512 0.024576-14.344192-11.59168-25.980928-25.901056-25.980928-14.348288 0-25.960448 11.634688-25.960448 25.980928 0 0 0 0.024576 0.024576 0.0512l0 489.967616L245.055488 336.826368c-4.683776-4.704256-11.2128-7.6288-18.374656-7.60832-14.342144-0.02048-25.954304 11.614208-26.005504 25.9072 0 7.20896 2.951168 13.768704 7.684096 18.423808L523.15136 688.433152 523.15136 688.433152 523.15136 688.433152M523.15136 688.433152 523.15136 688.433152z</Geometry>
+    <Geometry o:Freeze="True" x:Key="SaveGeometry">M608 320C625.664 320 640 305.696 640 288L640 160C640 142.304 625.664 128 608 128 590.336 128 576 142.304 576 160L576 288C576 305.696 590.336 320 608 320L608 320ZM960 896C960 931.328 931.328 960 896 960L128 960C92.672 960 64 931.328 64 896L64 128C64 92.672 92.672 64 128 64L192 64 192 384C192 419.328 220.672 448 256 448L768 448C803.328 448 832 419.328 832 384L832 64 896 64C931.328 64 960 92.672 960 128L960 896 960 896ZM256 64 768 64 768 352C768 369.696 753.664 384 736 384L288 384C270.336 384 256 369.696 256 352L256 64 256 64ZM896 0 128 0C57.312 0 0 57.312 0 128L0 896C0 966.688 57.312 1024 128 1024L896 1024C966.688 1024 1024 966.688 1024 896L1024 128C1024 57.312 966.688 0 896 0L896 0Z</Geometry>
+    <Geometry o:Freeze="True" x:Key="WindowsGeometry">M426.276571 574.829714l0 372.004571-389.705143-53.686857 0-318.317714 389.705143 0zM426.276571 150.308571l0 376.539429-389.705143 0 0-322.852571zM987.428571 574.829714l0 449.170286-518.290286-71.460571 0-377.709714 518.290286 0zM987.428571 73.142857l0 453.705143-518.290286 0 0-382.317714z</Geometry>
+    <Geometry o:Freeze="True" x:Key="FullScreenGeometry">M942 82v320h-50V167.4l-274 274-35.4-35.4 274-274H622V82h320zM406 582.6l-274 274V622H82v320h320v-50H167.4l274-274-35.4-35.4zM132 132h302V82H82v352h50V132z m760 760H590v50h352V590h-50v302z</Geometry>
+    <Geometry o:Freeze="True" x:Key="FullScreenReturnGeometry">M94.186081,59.07 L100,59.07 100,100 59.07,100 59.07,94.186081 94.186081,94.186081 z M4.5814285,58.208999 L41.791,58.208999 41.791,95.418571 35.977005,95.418571 35.977005,68.139304 4.1163101,100 0,95.88369 31.860695,64.022995 4.5814285,64.022995 z M95.88369,0 L100,4.1163101 68.139304,35.977005 95.418571,35.977005 95.418571,41.791 58.208999,41.791 58.208999,4.5814285 64.022995,4.5814285 64.022995,31.860695 z M0,0 L40.929998,0 40.929998,5.8139191 5.8139191,5.8139191 5.8139191,40.929998 0,40.929998 z</Geometry>
+    <Geometry o:Freeze="True" x:Key="SearchGeometry">M716.6003 213.800623c-138.851102-138.915088-364.020238-138.915088-502.935326 0s-138.915088 364.084225 0 502.935326a355.573996 355.573996 0 0 0 502.935326 0 355.573996 355.573996 0 0 0 0-502.935326z m-580.359212 580.359212a465.183184 465.183184 0 1 1 657.783099 0 465.183184 465.183184 0 0 1-657.783099 0z m868.939152 211.156054a63.474789 63.474789 0 0 1-89.837303 0l-89.773316-89.837303a63.410803 63.410803 0 1 1 89.773316-89.773316l89.837303 89.773316a63.346816 63.346816 0 0 1 0 89.837303z</Geometry>
+    <Geometry o:Freeze="True" x:Key="UpDownGeometry">M454.464 143.68l-253.44 253.44c-12.032 12.032-12.032 31.36 0 43.392 11.968 11.968 31.36 11.968 43.328 0l237.376-237.376 237.376 237.376c11.968 11.968 31.36 11.968 43.328 0 12.032-12.032 12.032-31.36 0-43.392l-253.44-253.44C491.264 126.016 478.016 124.032 454.464 143.68zM507.968 947.648l252.48-253.376c11.968-11.968 11.968-31.36 0-43.392-11.968-11.968-31.296-11.968-43.264 0l-236.48 237.376L244.16 650.88c-11.968-11.968-31.296-11.968-43.264 0-11.968 12.032-11.968 31.424 0 43.392l252.48 253.376C465.984 960 491.136 964.48 507.968 947.648z</Geometry>
+    <Geometry o:Freeze="True" x:Key="WindowMinGeometry">M0,4 L10,4 L10,5 L0,5 z</Geometry>
+    <Geometry o:Freeze="True" x:Key="CheckedGeometry">M 0,2 3,5 8,0</Geometry>
+    <Geometry o:Freeze="True" x:Key="EyeOpenGeometry">M928 406.4c-100.8-137.6-249.6-224-416-224s-315.2 86.4-416 224c-44.8 60.8-44.8 150.4 0 211.2 102.4 137.6 251.2 224 416 224 166.4 0 315.2-86.4 416-224 46.4-60.8 46.4-150.4 0-211.2zM512 721.6c-115.2 0-209.6-94.4-209.6-209.6 0-115.2 94.4-209.6 209.6-209.6 115.2 0 209.6 94.4 209.6 209.6 1.6 115.2-92.8 209.6-209.6 209.6z m0-360c-83.2 0-150.4 67.2-150.4 150.4s67.2 150.4 150.4 150.4 150.4-67.2 150.4-150.4-67.2-150.4-150.4-150.4z m0 0</Geometry>
+    <Geometry o:Freeze="True" x:Key="EyeCloseGeometry">M950.4 361.6c8-20.8 0-43.2-19.2-54.4-9.6-4.8-20.8-6.4-32-3.2s-19.2 11.2-24 22.4c-56 132.8-208 228.8-361.6 228.8-155.2 0-307.2-97.6-363.2-232-4.8-11.2-12.8-19.2-24-24-9.6-4.8-20.8-3.2-32 0-20.8 9.6-30.4 35.2-20.8 56 25.6 60.8 67.2 118.4 123.2 164.8l-67.2 70.4c-14.4 16-14.4 40 0 57.6 8 8 17.6 14.4 28.8 14.4s22.4-3.2 30.4-11.2l76.8-81.6c35.2 20.8 73.6 38.4 113.6 49.6l-28.8 83.2c-8 22.4 3.2 46.4 24 54.4 4.8 1.6 9.6 3.2 14.4 3.2 6.4 0 11.2-1.6 17.6-3.2 9.6-4.8 17.6-12.8 22.4-24l33.6-96c41.6 4.8 81.6 3.2 123.2-3.2l32 94.4c3.2 11.2 11.2 19.2 22.4 24 9.6 4.8 20.8 4.8 32 1.6 20.8-8 32-32 24-54.4l-28.8-84.8c30.4-9.6 59.2-22.4 86.4-38.4l62.4 65.6c14.4 16 43.2 16 57.6 0 16-16 16-43.2 0-60.8l-51.2-54.4c56-43.2 100.8-100.8 128-164.8z</Geometry>
+    <Geometry o:Freeze="True" x:Key="WindowRestoreGeometry">M1,3 L1,9 L7,9 L7,3 z M3,1 L3,2 L8,2 L8,7 L9,7 L9,1 z M2,0 L10,0 L10,8 L8,8 L8,10 L0,10 L0,2 L2,2 z</Geometry>
+    <Geometry o:Freeze="True" x:Key="WindowMaxGeometry">M1,1 L1,9 L9,9 L9,1 z M0,0 L10,0 L10,10 L0,10 z</Geometry>
+    <Geometry o:Freeze="True" x:Key="AudioGeometry">M627.52666696 962L550.66666696 890.47999971c116.82-92.99999971 191.09999971-230.94 191.09999971-385.2 0-146.99999971-67.61999971-279-174.96-371.57999942L643.84666667 62C770.86666638 172.99999971 850.66666667 330.2 850.66666667 505.09999971c0 182.27999971-86.58 345.42-223.13999971 456.90000029zM405.64666638 782l-76.32-77.22a227.88 227.88 0 0 0 116.40000058-199.26A228.06 228.06 0 0 0 347.86666638 317.84000029L422.86666696 242A334.37999971 334.37999971 0 0 1 550.66666696 505.52 334.62 334.62 0 0 1 405.64666638 782zM205.66666638 596.6C164.26666638 596.6 130.66666667 562.51999971 130.66666667 520.64 130.66666667 478.76000029 164.26666638 444.79999971 205.66666638 444.79999971s74.99999971 33.95999971 75.00000058 75.90000058c0 41.87999971-33.59999971 75.84000029-75.00000058 75.83999942z</Geometry>
+    <Geometry o:Freeze="True" x:Key="BubbleTailGeometry">M0,0L28,0 28,14.0000006258488 28,15.0010000765324 28.0151405334473,15.0010000765324 28.0455417633057,15.8010965883732C28.4084091186524,22.9596563875675,30.92209815979,29.5507589876652,34.9532623291016,34.9410597383976L34.9984359741211,34.9999815523624 34.0966339111328,34.9885679781437C15.1841707229614,34.5094191133976,2.0535663480814E-07,19.0279375612736,0,0z</Geometry>
+    <Geometry o:Freeze="True" x:Key="StarGeometry">M535.9 165.2l96.5 195.4c3.9 7.9 11.4 13.3 20.1 14.6l215.7 31.3c21.9 3.2 30.6 30 14.8 45.5L726.8 604.1c-6.3 6.1-9.1 14.9-7.7 23.6L756 842.5c3.7 21.8-19.1 38.4-38.7 28.1L524.4 769.2c-7.8-4.1-17-4.1-24.8 0L306.7 870.6c-19.6 10.3-42.4-6.3-38.7-28.1l36.8-214.8c1.5-8.6-1.4-17.5-7.7-23.6L141.1 452c-15.8-15.4-7.1-42.3 14.8-45.5l215.7-31.3c8.7-1.3 16.2-6.7 20.1-14.6l96.5-195.4c9.7-19.9 37.9-19.9 47.7 0z</Geometry>
+    <Geometry o:Freeze="True" x:Key="AddGeometry">M938.666667 426.666667h-341.333334V85.333333c0-46.933333-38.4-85.333333-85.333333-85.333333s-85.333333 38.4-85.333333 85.333333v341.333334H85.333333c-46.933333 0-85.333333 38.4-85.333333 85.333333s38.4 85.333333 85.333333 85.333333h341.333334v341.333334c0 46.933333 38.4 85.333333 85.333333 85.333333s85.333333-38.4 85.333333-85.333333v-341.333334h341.333334c46.933333 0 85.333333-38.4 85.333333-85.333333s-38.4-85.333333-85.333333-85.333333z</Geometry>
+    <Geometry o:Freeze="True" x:Key="SubGeometry">M62.5797 488.9508c0.2632 42.5185 34.985 77.2116 77.5035 77.5035l743.0216-0.6728c42.5185 0.3215 76.7437-33.9333 76.4518-76.4805l0 0c-0.2918-42.5175-34.985-77.2106-77.5045-77.5035l-743.0216-0.087C96.513 411.4473 62.2879 446.4323 62.5797 488.9508L62.5797 488.9508z</Geometry>
+    <Geometry o:Freeze="True" x:Key="WarningGeometry">M943.644188 827.215696l-351.176649-608.204749c-42.945473-74.36249-113.147387-74.36249-156.092861 0l-351.176649 608.204749c-42.946498 74.431167-7.811716 135.14955 78.012605 135.14955l702.420949 0C951.455904 962.36422 986.555836 901.645838 943.644188 827.215696zM466.187532 391.579035c12.621133-13.644108 28.66175-20.466675 48.233578-20.466675 19.580028 0 35.612444 6.75389 48.241778 20.194018 12.544256 13.473954 18.820484 30.325365 18.820484 50.587035 0 17.430551-26.19759 145.621205-34.929778 238.882082l-63.105666 0c-7.666162-93.259852-36.090106-221.450507-36.090106-238.882082C447.358847 421.938226 453.643275 405.155491 466.187532 391.579035zM561.76804 835.026386c-13.268949 12.928641-29.062535 19.375023-47.345906 19.375023-18.275171 0-34.076957-6.447407-47.346931-19.375023-13.235123-12.89379-19.818859-28.517221-19.818859-46.869269 0-18.249546 6.583736-34.043131 19.818859-47.278254 13.268949-13.235123 29.07176-19.852685 47.346931-19.852685 18.283371 0 34.076957 6.617562 47.345906 19.852685 13.235123 13.235123 19.827059 29.028709 19.827059 47.278254C581.595099 806.51019 575.003163 822.132597 561.76804 835.026386z</Geometry>
+    <Geometry o:Freeze="True" x:Key="InfoGeometry">M505.6512 39.0144c-261.2224 3.4816-470.1184 218.112-466.6368 479.4368 3.4816 261.12 218.112 470.1184 479.3344 466.6368 261.2224-3.4816 470.1184-218.112 466.7392-479.3344C981.504 244.4288 766.8736 35.5328 505.6512 39.0144zM558.08 196.608c48.128 0 62.2592 27.9552 62.2592 59.8016 0 39.8336-31.9488 76.6976-86.3232 76.6976-45.568 0-67.1744-22.9376-65.9456-60.8256C468.0704 240.4352 494.7968 196.608 558.08 196.608zM434.7904 807.6288c-32.8704 0-56.9344-19.968-33.8944-107.6224l37.6832-155.5456c6.5536-24.8832 7.68-34.9184 0-34.9184-9.8304 0-52.5312 17.2032-77.7216 34.2016l-16.384-26.9312c79.9744-66.7648 171.8272-105.8816 211.2512-105.8816 32.8704 0 38.2976 38.912 21.9136 98.6112l-43.2128 163.5328c-7.68 28.8768-4.4032 38.912 3.2768 38.912 9.9328 0 42.1888-11.9808 73.9328-36.9664l18.6368 24.8832C552.5504 777.728 467.6608 807.6288 434.7904 807.6288z</Geometry>
+    <Geometry o:Freeze="True" x:Key="ErrorGeometry">M495.469714 0C224.621714 0 0 224.621714 0 495.469714c0 270.884571 224.621714 495.506286 495.469714 495.506286 270.884571 0 495.506286-224.621714 495.506286-495.506286C990.976 224.621714 766.354286 0 495.469714 0z m211.419429 634.221714c19.821714 19.821714 19.821714 46.226286 0 66.048s-46.226286 19.821714-66.048 0l-138.752-138.715428-145.334857 145.334857a51.858286 51.858286 0 0 1-72.667429 0 51.858286 51.858286 0 0 1 0-72.667429l145.334857-145.334857-138.752-138.752c-19.821714-19.821714-19.821714-46.226286 0-66.048s46.262857-19.821714 66.084572 0l138.715428 138.715429 145.371429-145.334857a51.858286 51.858286 0 0 1 72.667428 0 51.858286 51.858286 0 0 1 0 72.667428l-145.371428 145.334857 138.752 138.752z</Geometry>
+    <Geometry o:Freeze="True" x:Key="SuccessGeometry">M512.66048 64.64c-247.424 0-448 200.57728-448 448s200.576 448 448 448 448-200.57728 448-448c0-247.424-200.57728-448-448-448z m250.71232 334.86336L480.98176 681.89312c-15.49568 15.49696-40.61952 15.49696-56.11648 0l-162.9184-162.9184c-15.49568-15.49568-15.49568-40.61824 0-56.1152s40.61952-15.49568 56.11648 0l134.85952 134.85952L707.25504 343.3856c15.49568-15.49568 40.61952-15.49568 56.11648 0s15.49696 40.6208 0.00128 56.11776z</Geometry>
+    <Geometry o:Freeze="True" x:Key="FatalGeometry">M716.8 375.466667l34.133333 34.133333c17.066667 17.066667 42.666667 17.066667 59.733334 0 17.066667-17.066667 17.066667-42.666667 0-59.733333l-34.133334-34.133334 34.133334-34.133333c17.066667-17.066667 17.066667-42.666667 0-59.733333-17.066667-17.066667-42.666667-17.066667-59.733334 0l-34.133333 34.133333-34.133333-34.133333c-17.066667-17.066667-42.666667-17.066667-59.733334 0-17.066667 17.066667-17.066667 42.666667 0 59.733333l34.133334 34.133333-34.133334 34.133334c-17.066667 17.066667-17.066667 42.666667 0 59.733333 17.066667 17.066667 42.666667 17.066667 59.733334 0l34.133333-34.133333z m-426.666667 0l34.133334 34.133333c17.066667 17.066667 42.666667 17.066667 59.733333 0 17.066667-17.066667 17.066667-42.666667 0-59.733333l-34.133333-34.133334 34.133333-34.133333c17.066667-17.066667 17.066667-42.666667 0-59.733333-17.066667-17.066667-42.666667-17.066667-59.733333 0l-34.133334 34.133333-34.133333-34.133333c-17.066667-17.066667-42.666667-17.066667-59.733333 0-17.066667 17.066667-17.066667 42.666667 0 59.733333l34.133333 34.133333-34.133333 34.133334c-17.066667 17.066667-17.066667 42.666667 0 59.733333 17.066667 17.066667 42.666667 17.066667 59.733333 0l34.133333-34.133333zM0 85.333333c0-51.2 42.666667-85.333333 85.333333-85.333333h853.333334c51.2 0 85.333333 42.666667 85.333333 85.333333v853.333334c0 51.2-42.666667 85.333333-85.333333 85.333333H85.333333c-51.2 0-85.333333-42.666667-85.333333-85.333333V85.333333z m512 469.333334c-136.533333 0-230.4 68.266667-290.133333 196.266666-8.533333 17.066667 0 42.666667 17.066666 59.733334s42.666667 0 59.733334-17.066667c51.2-93.866667 110.933333-145.066667 221.866666-145.066667 102.4 0 170.666667 51.2 221.866667 145.066667 8.533333 17.066667 34.133333 25.6 59.733333 17.066667 17.066667-8.533333 25.6-34.133333 17.066667-59.733334-76.8-128-170.666667-196.266667-307.2-196.266666z</Geometry>
+    <Geometry o:Freeze="True" x:Key="AskGeometry">M512 0 30.11843 240.941297l0 542.117406 481.88157 240.941297 481.88157-240.941297L993.88157 240.941297 512 0zM575.776472 768.799969 460.188012 768.799969 460.188012 656.222073l115.588459 0L575.776472 768.799969zM623.335603 509.329685c-52.375829 36.723353-59.600363 55.988096-59.600363 84.885211l0 19.866447L468.616977 614.081343l0-26.489278c0-45.754021 13.846342-80.67124 61.406497-116.791866 46.957428-36.723353 57.79423-62.0082 57.79423-84.282484 0-25.284848-21.67258-54.181962-55.386393-54.181962-42.743457 0-70.436142 26.489278-82.477374 85.486914l-105.956088-21.67258c24.683144-111.976192 82.477374-157.127486 205.289345-157.127486 98.12985 0 157.72919 63.212631 157.72919 131.842639C707.017407 423.240044 688.956071 461.76953 623.335603 509.329685z</Geometry>
+    <Geometry o:Freeze="True" x:Key="AllGeometry">M 721.005 638.949 C 758.74 638.949 789.333 669.56 789.333 707.312 C 789.333 745.047 758.74 775.657 721.005 775.657 C 683.253 775.657 652.66 745.047 652.66 707.312 C 652.66 669.56 683.253 638.949 721.005 638.949 Z M 512.017 638.949 C 549.77 638.949 580.38 669.56 580.38 707.312 C 580.38 745.047 549.77 775.657 512.017 775.657 C 474.265 775.657 443.672 745.047 443.672 707.312 C 443.672 669.56 474.265 638.949 512.017 638.949 Z M 303.029 638.949 C 340.781 638.949 371.392 669.56 371.392 707.312 C 371.392 745.047 340.781 775.657 303.029 775.657 C 265.277 775.657 234.667 745.047 234.667 707.312 C 234.667 669.56 265.277 638.949 303.029 638.949 Z M 721.005 443.655 C 758.74 443.655 789.333 474.265 789.333 512.017 C 789.333 549.769 758.74 580.363 721.005 580.363 C 683.253 580.363 652.66 549.769 652.66 512.017 C 652.66 474.265 683.253 443.655 721.005 443.655 Z M 512.017 443.655 C 549.77 443.655 580.38 474.265 580.38 512.017 C 580.38 549.769 549.77 580.363 512.017 580.363 C 474.265 580.363 443.672 549.769 443.672 512.017 C 443.672 474.265 474.265 443.655 512.017 443.655 Z M 303.029 443.655 C 340.781 443.655 371.392 474.265 371.392 512.017 C 371.392 549.769 340.781 580.363 303.029 580.363 C 265.277 580.363 234.667 549.769 234.667 512.017 C 234.667 474.265 265.277 443.655 303.029 443.655 Z M 721.005 248.343 C 758.74 248.343 789.333 278.953 789.333 316.688 C 789.333 354.44 758.74 385.051 721.005 385.051 C 683.253 385.051 652.66 354.44 652.66 316.688 C 652.66 278.953 683.253 248.343 721.005 248.343 Z M 512.017 248.343 C 549.77 248.343 580.38 278.953 580.38 316.688 C 580.38 354.44 549.77 385.051 512.017 385.051 C 474.265 385.051 443.672 354.44 443.672 316.688 C 443.672 278.953 474.265 248.343 512.017 248.343 Z M 303.029 248.343 C 340.781 248.343 371.392 278.953 371.392 316.688 C 371.392 354.44 340.781 385.051 303.029 385.051 C 265.277 385.051 234.667 354.44 234.667 316.688 C 234.667 278.953 265.277 248.343 303.029 248.343 Z</Geometry>
+    <Geometry o:Freeze="True" x:Key="DragGeometry">M384 896C384 825.307552 440.814697 768 512 768 582.692448 768 640 824.814694 640 896 640 966.692448 583.185303 1024 512 1024 441.307552 1024 384 967.185306 384 896ZM384 512C384 441.307552 440.814697 384 512 384 582.692448 384 640 440.814697 640 512 640 582.692448 583.185303 640 512 640 441.307552 640 384 583.185303 384 512ZM384 128C384 57.307552 440.814697 0 512 0 582.692448 0 640 56.814697 640 128 640 198.692448 583.185303 256 512 256 441.307552 256 384 199.185303 384 128Z</Geometry>
+    <Geometry o:Freeze="True" x:Key="DropperGeometry">M798.165333 97.834667a42.624 42.624 0 0 0-60.330666 0l-140.629334 140.629333-55.381333-55.296-60.330667 60.330667 55.381334 55.296-353.706667 353.706666a42.709333 42.709333 0 0 0-11.221333 19.84l-42.666667 170.666667a42.538667 42.538667 0 0 0 51.712 51.712l170.666667-42.666667c7.509333-1.877333 14.378667-5.76 19.84-11.221333l353.792-353.792 55.210666 55.125333 60.330667-60.330666-55.210667-55.125334 140.544-140.544a42.624 42.624 0 0 0 0-60.330666l-128-128zM319.488 772.138667l-90.197333 22.570666 22.570666-90.197333 345.386667-345.386667 67.669333 67.584-345.429333 345.429334z</Geometry>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Image.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Image.xaml
index 5fd888c7..12c5dff7 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Image.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Image.xaml
@@ -2,7 +2,7 @@
 
     <Style TargetType="Image">
         <Setter Property="Stretch" Value="Uniform" />
-        <Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality" />
+        <Setter Property="RenderOptions.BitmapScalingMode" Value="LowQuality" />
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/ConfigHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/ConfigHelper.cs
index f15e82a5..1e9fecf0 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/ConfigHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/ConfigHelper.cs
@@ -6,6 +6,7 @@ using System.Runtime.CompilerServices;
 #endif
 using System.Windows;
 using System.Windows.Markup;
+using System.Windows.Media.Animation;
 using HandyControl.Controls;
 using HandyControl.Data;
 
@@ -50,8 +51,12 @@ namespace HandyControl.Tools
         {
             SetSystemVersionInfo(config.SystemVersionInfo);
             SetLang(config.Lang);
+            SetTimelineFrameRate(config.TimelineFrameRate);
         }
 
+        public void SetTimelineFrameRate(int rate) => 
+            Timeline.DesiredFrameRateProperty.OverrideMetadata(typeof(Timeline), new FrameworkPropertyMetadata(rate));
+
         public void SetWindowDefaultStyle(object resourceKey = null)
         {
             var metadata = resourceKey == null
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs
index 818df6bc..23f73766 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs
@@ -148,5 +148,7 @@ namespace HandyControl.Tools
         public static IntPtr CreateHandle() => new WindowInteropHelper(new Window()).EnsureHandle();
 
         public static IntPtr GetHandle(this Window window) => new WindowInteropHelper(window).EnsureHandle();
+
+        public static HwndSource GetHwndSource(this Window window) => HwndSource.FromHwnd(window.GetHandle());
     }
 }
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs b/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
index c183fb44..971fe31d 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
@@ -42,6 +42,19 @@ namespace HandyControl.Tools.Interop
             NIIF_INFO = 0x00000001,
             NIIF_WARNING = 0x00000002,
             NIIF_ERROR = 0x00000003,
+            WM_ACTIVATE = 0x0006,
+            WM_QUIT = 0x0012,
+            WM_WINDOWPOSCHANGING = 0x0046,
+            WM_WINDOWPOSCHANGED = 0x0047,
+            WM_SETICON = 0x0080,
+            WM_NCCREATE = 0x0081,
+            WM_NCDESTROY = 0x0082,
+            WM_NCACTIVATE = 0x0086,
+            WM_NCRBUTTONDOWN = 0x00A4,
+            WM_NCRBUTTONUP = 0x00A5,
+            WM_NCRBUTTONDBLCLK = 0x00A6,
+            WM_NCUAHDRAWCAPTION = 0x00AE,
+            WM_NCUAHDRAWFRAME = 0x00AF,
             WM_KEYDOWN = 0x0100,
             WM_KEYUP = 0x0101,
             WM_SYSKEYDOWN = 0x0104,
@@ -53,6 +66,7 @@ namespace HandyControl.Tools.Interop
             WM_RBUTTONUP = 0x0205,
             WM_CLIPBOARDUPDATE = 0x031D,
             WM_USER = 0x0400,
+            WS_VISIBLE = 0x10000000,
             MF_BYPOSITION = 0x400,
             MF_SEPARATOR = 0x800,
             TB_GETBUTTON = WM_USER + 23,
@@ -61,7 +75,12 @@ namespace HandyControl.Tools.Interop
             VERTRES = 10,
             DESKTOPVERTRES = 117,
             LOGPIXELSX = 88,
-            LOGPIXELSY = 90;
+            LOGPIXELSY = 90,
+            SC_SIZE = 0xF000,
+            SC_MOVE = 0xF010,
+            SC_MINIMIZE = 0xF020,
+            SC_MAXIMIZE = 0xF030,
+            SC_RESTORE = 0xF120;
 
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
         internal class NOTIFYICONDATA
@@ -230,7 +249,7 @@ namespace HandyControl.Tools.Interop
             STYLE = -16,
             EXSTYLE = -20
         }
-        
+
         internal enum GWLP
         {
             WNDPROC = -4,

From 203fbb45417f11e65a2836916776fe84bbbdffb8 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 2 Feb 2020 16:06:49 +0800
Subject: [PATCH 30/41] fixed #319

---
 .../UserControl/Main/OverView.xaml                |  2 +-
 .../Controls/Other/NotifyIcon.cs                  |  2 +-
 .../Tools/Interop/InteropMethods.cs               |  5 +++++
 .../Tools/Interop/InteropValues.cs                | 15 +++++++++++++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/OverView.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/OverView.xaml
index 2b00d656..7284de08 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/OverView.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/OverView.xaml
@@ -7,7 +7,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:userControl="clr-namespace:HandyControlDemo.UserControl">
-    <ScrollViewer HorizontalScrollBarVisibility="Auto">
+    <ScrollViewer HorizontalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Visible">
         <Canvas HorizontalAlignment="Center" VerticalAlignment="Center" Name="CanvasMain" Margin="32" Width="1665" Height="1300">
             <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4">
                 <StackPanel>
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
index 831d7f22..cd15bd75 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
@@ -530,7 +530,7 @@ namespace HandyControl.Controls
         private void RegisterClass()
         {
             _windowClassName = $"HandyControl.Controls.NotifyIcon{Guid.NewGuid()}";
-            var wndclass = new InteropValues.WNDCLASS
+            var wndclass = new InteropValues.WNDCLASS4ICON
             {
                 style = 0,
                 lpfnWndProc = _callback,
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs b/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs
index 2af265bf..06bfb21d 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs
@@ -244,6 +244,11 @@ namespace HandyControl.Tools.Interop
         [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Unicode, SetLastError = true, BestFitMapping = false)]
         internal static extern short RegisterClass(InteropValues.WNDCLASS wc);
 
+        [SecurityCritical]
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Unicode, SetLastError = true, BestFitMapping = false)]
+        internal static extern short RegisterClass(InteropValues.WNDCLASS4ICON wc);
+
         [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
         internal static extern IntPtr DefWindowProc(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
 
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs b/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
index 971fe31d..eed8f91d 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
@@ -579,6 +579,21 @@ namespace HandyControl.Tools.Interop
             public string lpszClassName;
         }
 
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+        internal class WNDCLASS4ICON
+        {
+            public int style;
+            public WndProc lpfnWndProc;
+            public int cbClsExtra;
+            public int cbWndExtra;
+            public IntPtr hInstance;
+            public IntPtr hIcon;
+            public IntPtr hCursor;
+            public IntPtr hbrBackground;
+            public string lpszMenuName;
+            public string lpszClassName;
+        }
+
         [StructLayout(LayoutKind.Sequential, Pack = 2)]
         internal struct BITMAPINFO
         {

From f261f3199f8a6a12af4d894a72792e316336e01b Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Mon, 3 Feb 2020 15:45:57 +0800
Subject: [PATCH 31/41] fixed some bugs

---
 .../HandyControlDemo_Core30.csproj            |  5 +++
 .../HandyControlDemo_Net_40.csproj            |  5 +++
 .../HandyControlDemo_Net_GE45.csproj          |  5 +++
 .../HandyControlDemo_Shared/App.xaml.cs       | 14 +++++++
 .../Properties/App.config                     |  3 ++
 .../Resources/Themes/Basic/Brushes.xaml       | 18 ++++-----
 .../Tools/GeometryAnimationDemoCtl.xaml       |  5 ++-
 .../Controls/Image/ImageBlock.cs              | 35 +++++++++++++++++-
 .../Controls/Other/Carousel.cs                | 34 ++++++++++++++++-
 .../Controls/Other/NotifyIcon.cs              |  5 +--
 .../Controls/Time/FlipClock/FlipClock.cs      | 37 +++++++++++++++++--
 11 files changed, 147 insertions(+), 19 deletions(-)
 create mode 100644 src/Shared/HandyControlDemo_Shared/Properties/App.config

diff --git a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj
index 80a476b3..dc1bfbd0 100644
--- a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj
+++ b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj
@@ -483,6 +483,11 @@
       <LastGenOutput>Lang.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\Shared\HandyControlDemo_Shared\Properties\App.config">
+      <Link>Properties\App.config</Link>
+    </None>
+  </ItemGroup>
   <ItemGroup>
     <Content Include="..\..\Shared\HandyControlDemo_Shared\Data\MessageToken.tt">
       <Link>Data\MessageToken.tt</Link>
diff --git a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
index 98fcf4f6..b869564e 100644
--- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
+++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
@@ -419,6 +419,11 @@
       <LastGenOutput>Lang.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\Shared\HandyControlDemo_Shared\Properties\App.config">
+      <Link>Properties\App.config</Link>
+    </None>
+  </ItemGroup>
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\fabric-icons.ttf">
       <Link>Resources\fabric-icons.ttf</Link>
diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
index 2fd623be..f61370b1 100644
--- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
@@ -488,6 +488,11 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\Shared\HandyControlDemo_Shared\Properties\App.config">
+      <Link>Properties\App.config</Link>
+    </None>
+  </ItemGroup>
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\RepeatButton_16x.png">
       <Link>Resources\Img\LeftMainContent\RepeatButton_16x.png</Link>
diff --git a/src/Shared/HandyControlDemo_Shared/App.xaml.cs b/src/Shared/HandyControlDemo_Shared/App.xaml.cs
index 72e70341..d65ad0ee 100644
--- a/src/Shared/HandyControlDemo_Shared/App.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/App.xaml.cs
@@ -3,6 +3,7 @@ using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Net;
+using System.Runtime;
 using System.Security.Authentication; 
 using System.Threading;
 using System.Windows;
@@ -21,6 +22,19 @@ namespace HandyControlDemo
         private static Mutex AppMutex;
 #pragma warning restore IDE0052
 
+        public App()
+        {
+#if !netle40
+            var cachePath = $"{AppDomain.CurrentDomain.BaseDirectory}Cache";
+            if (!Directory.Exists(cachePath))
+            {
+                Directory.CreateDirectory(cachePath);
+            }
+            ProfileOptimization.SetProfileRoot(cachePath);
+            ProfileOptimization.StartProfile("Profile");
+#endif
+        }
+
         protected override void OnStartup(StartupEventArgs e)
         {
             AppMutex = new Mutex(true, "HandyControlDemo", out var createdNew);
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/App.config b/src/Shared/HandyControlDemo_Shared/Properties/App.config
new file mode 100644
index 00000000..49cc43e1
--- /dev/null
+++ b/src/Shared/HandyControlDemo_Shared/Properties/App.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+</configuration>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Brushes.xaml b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Brushes.xaml
index bcee168f..95654be8 100644
--- a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Brushes.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Brushes.xaml
@@ -6,7 +6,7 @@
         <ResourceDictionary Source="Geometries.xaml"/>
     </ResourceDictionary.MergedDictionaries>
     
-    <DrawingBrush o:Freeze="True" x:Key="MainContentForegroundDrawingBrush" RenderOptions.CachingHint="Cache" Viewport="0,0,16,16" ViewportUnits="Absolute" Stretch="None" TileMode="Tile">
+    <DrawingBrush o:Freeze="True" x:Key="MainContentForegroundDrawingBrush" RenderOptions.CacheInvalidationThresholdMinimum="0.5" RenderOptions.CacheInvalidationThresholdMaximum="2.0" RenderOptions.CachingHint="Cache" Viewport="0,0,16,16" ViewportUnits="Absolute" Stretch="None" TileMode="Tile">
         <DrawingBrush.Drawing>
             <DrawingGroup o:Freeze="True">
                 <GeometryDrawing o:Freeze="True" Brush="{DynamicResource MainContentForegroundBrush}">
@@ -21,7 +21,7 @@
         </DrawingBrush.Drawing>
     </DrawingBrush>
 
-    <DrawingBrush o:Freeze="True" x:Key="GitHubDrawingBrush" RenderOptions.CachingHint="Cache" Viewport="0,0,200,100" ViewportUnits="Absolute" Stretch="Uniform" TileMode="Tile">
+    <DrawingBrush o:Freeze="True" x:Key="GitHubDrawingBrush" RenderOptions.CacheInvalidationThresholdMinimum="0.5" RenderOptions.CacheInvalidationThresholdMaximum="2.0" RenderOptions.CachingHint="Cache" Viewport="0,0,200,100" ViewportUnits="Absolute" Stretch="Uniform" TileMode="Tile">
         <DrawingBrush.Transform>
             <TransformGroup o:Freeze="True">
                 <RotateTransform o:Freeze="True" Angle="20"/>
@@ -34,7 +34,7 @@
         </DrawingBrush.Drawing>
     </DrawingBrush>
 
-    <DrawingBrush o:Freeze="True" x:Key="QqDrawingBrush" RenderOptions.CachingHint="Cache" Viewport="0,0,100,200" ViewportUnits="Absolute" Stretch="Uniform" TileMode="Tile">
+    <DrawingBrush o:Freeze="True" x:Key="QqDrawingBrush" RenderOptions.CacheInvalidationThresholdMinimum="0.5" RenderOptions.CacheInvalidationThresholdMaximum="2.0" RenderOptions.CachingHint="Cache" Viewport="0,0,100,200" ViewportUnits="Absolute" Stretch="Uniform" TileMode="Tile">
         <DrawingBrush.Transform>
             <TransformGroup o:Freeze="True">
                 <RotateTransform o:Freeze="True" Angle="20"/>
@@ -47,7 +47,7 @@
         </DrawingBrush.Drawing>
     </DrawingBrush>
 
-    <DrawingBrush o:Freeze="True" x:Key="BlogDrawingBrush" RenderOptions.CachingHint="Cache" Viewport="0,0,160,100" ViewportUnits="Absolute" Stretch="Uniform" TileMode="Tile">
+    <DrawingBrush o:Freeze="True" x:Key="BlogDrawingBrush" RenderOptions.CacheInvalidationThresholdMinimum="0.5" RenderOptions.CacheInvalidationThresholdMaximum="2.0" RenderOptions.CachingHint="Cache" Viewport="0,0,160,100" ViewportUnits="Absolute" Stretch="Uniform" TileMode="Tile">
         <DrawingBrush.Transform>
             <TransformGroup o:Freeze="True">
                 <RotateTransform o:Freeze="True" Angle="20"/>
@@ -59,7 +59,7 @@
                     <RectangleGeometry o:Freeze="True" Rect="0,0,160,100"></RectangleGeometry>
                 </GeometryDrawing.Geometry>
                 <GeometryDrawing.Brush>
-                    <VisualBrush o:Freeze="True">
+                    <VisualBrush o:Freeze="True" RenderOptions.CachingHint="Cache" RenderOptions.CacheInvalidationThresholdMinimum="0.5" RenderOptions.CacheInvalidationThresholdMaximum="2.0" >
                         <VisualBrush.Visual>
                             <StackPanel>
                                 <TextBlock Text="Blog" Foreground="{DynamicResource DarkMaskBrush}"/>
@@ -71,7 +71,7 @@
         </DrawingBrush.Drawing>
     </DrawingBrush>
 
-    <DrawingBrush o:Freeze="True" x:Key="WebsiteDrawingBrush" RenderOptions.CachingHint="Cache" Viewport="0,0,320,100" ViewportUnits="Absolute" Stretch="Uniform" TileMode="Tile">
+    <DrawingBrush o:Freeze="True" x:Key="WebsiteDrawingBrush" RenderOptions.CacheInvalidationThresholdMinimum="0.5" RenderOptions.CacheInvalidationThresholdMaximum="2.0" RenderOptions.CachingHint="Cache" Viewport="0,0,320,100" ViewportUnits="Absolute" Stretch="Uniform" TileMode="Tile">
         <DrawingBrush.Transform>
             <TransformGroup o:Freeze="True">
                 <RotateTransform o:Freeze="True" Angle="20"/>
@@ -83,7 +83,7 @@
                     <RectangleGeometry o:Freeze="True" Rect="0,0,320,100"></RectangleGeometry>
                 </GeometryDrawing.Geometry>
                 <GeometryDrawing.Brush>
-                    <VisualBrush o:Freeze="True">
+                    <VisualBrush o:Freeze="True" RenderOptions.CachingHint="Cache" RenderOptions.CacheInvalidationThresholdMinimum="0.5" RenderOptions.CacheInvalidationThresholdMaximum="2.0">
                         <VisualBrush.Visual>
                             <StackPanel>
                                 <TextBlock Text="Website" Foreground="{DynamicResource DarkMaskBrush}"/>
@@ -95,7 +95,7 @@
         </DrawingBrush.Drawing>
     </DrawingBrush>
 
-    <DrawingBrush o:Freeze="True" x:Key="ProjectDrawingBrush" RenderOptions.CachingHint="Cache" Viewport="0,0,240,100" ViewportUnits="Absolute" Stretch="Uniform" TileMode="Tile">
+    <DrawingBrush o:Freeze="True" x:Key="ProjectDrawingBrush" RenderOptions.CacheInvalidationThresholdMinimum="0.5" RenderOptions.CacheInvalidationThresholdMaximum="2.0" RenderOptions.CachingHint="Cache" Viewport="0,0,240,100" ViewportUnits="Absolute" Stretch="Uniform" TileMode="Tile">
         <DrawingBrush.Transform>
             <TransformGroup o:Freeze="True">
                 <RotateTransform o:Freeze="True" Angle="20"/>
@@ -107,7 +107,7 @@
                     <RectangleGeometry o:Freeze="True" Rect="0,0,240,100"></RectangleGeometry>
                 </GeometryDrawing.Geometry>
                 <GeometryDrawing.Brush>
-                    <VisualBrush o:Freeze="True">
+                    <VisualBrush o:Freeze="True" RenderOptions.CachingHint="Cache" RenderOptions.CacheInvalidationThresholdMinimum="0.5" RenderOptions.CacheInvalidationThresholdMaximum="2.0" >
                         <VisualBrush.Visual>
                             <StackPanel>
                                 <TextBlock Text="Project" Foreground="{DynamicResource DarkMaskBrush}"/>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Tools/GeometryAnimationDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Tools/GeometryAnimationDemoCtl.xaml
index ede0f570..bce845a2 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Tools/GeometryAnimationDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Tools/GeometryAnimationDemoCtl.xaml
@@ -27,7 +27,10 @@
     </UserControl.Resources>
     <UserControl.Triggers>
         <EventTrigger RoutedEvent="FrameworkElement.Loaded">
-            <BeginStoryboard Storyboard="{StaticResource StoryboardOnLoaded}"/>
+            <BeginStoryboard Name="BeginStoryboard" Storyboard="{StaticResource StoryboardOnLoaded}"/>
+        </EventTrigger>
+        <EventTrigger RoutedEvent="FrameworkElement.Unloaded">
+            <StopStoryboard BeginStoryboardName="BeginStoryboard"/>
         </EventTrigger>
     </UserControl.Triggers>
     <hc:TransitioningContentControl>
diff --git a/src/Shared/HandyControl_Shared/Controls/Image/ImageBlock.cs b/src/Shared/HandyControl_Shared/Controls/Image/ImageBlock.cs
index 11f3adcb..1093a4fe 100644
--- a/src/Shared/HandyControl_Shared/Controls/Image/ImageBlock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Image/ImageBlock.cs
@@ -23,13 +23,46 @@ namespace HandyControl.Controls
 
         private int _blockHeight;
 
+        private bool _isDisposed;
+
         public ImageBlock()
         {
             _dispatcherTimer = new DispatcherTimer(DispatcherPriority.Render)
             {
                 Interval = Interval
             };
-            _dispatcherTimer.Tick += DispatcherTimer_Tick;
+
+            IsVisibleChanged += ImageBlock_IsVisibleChanged;
+        }
+
+        ~ImageBlock() => Dispose();
+
+        public void Dispose()
+        {
+            if (_isDisposed) return;
+
+            IsVisibleChanged -= ImageBlock_IsVisibleChanged;
+            _dispatcherTimer.Stop();
+            _isDisposed = true;
+
+            GC.SuppressFinalize(this);
+        }
+
+        private void ImageBlock_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            if(IsVisible)
+            {
+                _dispatcherTimer.Tick += DispatcherTimer_Tick;
+                if (IsPlaying)
+                {
+                    _dispatcherTimer.Start();
+                }
+            }
+            else
+            {
+                _dispatcherTimer.Stop();
+                _dispatcherTimer.Tick -= DispatcherTimer_Tick;
+            }
         }
 
         private void UpdateDatas()
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Carousel.cs b/src/Shared/HandyControl_Shared/Controls/Other/Carousel.cs
index 61cc89ad..47ac493a 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Carousel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Carousel.cs
@@ -22,7 +22,7 @@ namespace HandyControl.Controls
     [ContentProperty("Items")]
     [TemplatePart(Name = ElementPanelPage, Type = typeof(Panel))]
     [TemplatePart(Name = ElementItemsControl, Type = typeof(ItemsPresenter))]
-    public class Carousel : ListBox
+    public class Carousel : ListBox, IDisposable
     {
         #region Constants
 
@@ -33,6 +33,8 @@ namespace HandyControl.Controls
 
         #region Data
 
+        private bool _isDisposed;
+
         private Panel _panelPage;
 
         private bool _appliedTemplate;
@@ -119,6 +121,36 @@ namespace HandyControl.Controls
             CommandBindings.Add(new CommandBinding(ControlCommands.Selected, ButtonPages_OnClick));
 
             Loaded += (s, e) => UpdatePageButtons();
+            IsVisibleChanged += Carousel_IsVisibleChanged;
+        }
+
+        ~Carousel() => Dispose();
+
+        public void Dispose()
+        {
+            if (_isDisposed) return;
+
+            IsVisibleChanged -= Carousel_IsVisibleChanged;
+            _updateTimer.Stop();
+            _isDisposed = true;
+
+            GC.SuppressFinalize(this);
+        }
+
+        private void Carousel_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            if (_updateTimer == null) return;
+
+            if (IsVisible)
+            {
+                _updateTimer.Tick += UpdateTimer_Tick;
+                _updateTimer.Start();
+            }
+            else
+            {
+                _updateTimer.Stop();
+                _updateTimer.Tick -= UpdateTimer_Tick;
+            }
         }
 
         protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
index cd15bd75..6531ccf6 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
@@ -93,10 +93,7 @@ namespace HandyControl.Controls
             if (Application.Current != null) Application.Current.Exit += (s, e) => Dispose();
         }
 
-        ~NotifyIcon()
-        {
-            Dispose(false);
-        }
+        ~NotifyIcon() => Dispose(false);
 
         public void Init()
         {
diff --git a/src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipClock.cs b/src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipClock.cs
index bd066e7d..d7d1fc0d 100644
--- a/src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipClock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipClock.cs
@@ -8,6 +8,10 @@ namespace HandyControl.Controls
 {
     public class FlipClock : Control
     {
+        private readonly DispatcherTimer _dispatcherTimer;
+
+        private bool _isDisposed;
+
         public static readonly DependencyProperty NumberListProperty = DependencyProperty.Register(
             "NumberList", typeof(List<int>), typeof(FlipClock), new PropertyMetadata(new List<int> {0, 0, 0, 0, 0, 0}));
 
@@ -44,12 +48,39 @@ namespace HandyControl.Controls
 
         public FlipClock()
         {
-            var dispatcherTimer = new DispatcherTimer
+            _dispatcherTimer = new DispatcherTimer(DispatcherPriority.Render)
             {
                 Interval = TimeSpan.FromMilliseconds(200)
             };
-            dispatcherTimer.Tick += DispatcherTimer_Tick;
-            dispatcherTimer.Start();
+
+            IsVisibleChanged += FlipClock_IsVisibleChanged;
+        }
+
+        ~FlipClock() => Dispose();
+
+        public void Dispose()
+        {
+            if (_isDisposed) return;
+
+            IsVisibleChanged -= FlipClock_IsVisibleChanged;
+            _dispatcherTimer.Stop();
+            _isDisposed = true;
+
+            GC.SuppressFinalize(this);
+        }
+
+        private void FlipClock_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            if (IsVisible)
+            {
+                _dispatcherTimer.Tick += DispatcherTimer_Tick;
+                _dispatcherTimer.Start();
+            }
+            else
+            {
+                _dispatcherTimer.Stop();
+                _dispatcherTimer.Tick -= DispatcherTimer_Tick;
+            }
         }
 
         private void DispatcherTimer_Tick(object sender, EventArgs e) => DisplayTime = DateTime.Now;

From f652cc20ea8ed8a5fa225585088af787a39a7307 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Mon, 3 Feb 2020 15:57:26 +0800
Subject: [PATCH 32/41] Update RelativePanel.cs

---
 .../Controls/Panel/RelativePanel.cs                  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
index f2705d0e..7d4dffad 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
@@ -2,9 +2,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Markup;
 using HandyControl.Data;
 
 namespace HandyControl.Controls
@@ -63,6 +65,7 @@ namespace HandyControl.Controls
         public static void SetAlignLeftWith(DependencyObject element, UIElement value)
             => element.SetValue(AlignLeftWithProperty, value);
 
+        [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetAlignLeftWith(DependencyObject element)
             => (UIElement) element.GetValue(AlignLeftWithProperty);
 
@@ -72,6 +75,7 @@ namespace HandyControl.Controls
         public static void SetAlignTopWith(DependencyObject element, UIElement value)
             => element.SetValue(AlignTopWithProperty, value);
 
+        [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetAlignTopWith(DependencyObject element)
             => (UIElement) element.GetValue(AlignTopWithProperty);
 
@@ -81,6 +85,7 @@ namespace HandyControl.Controls
         public static void SetAlignRightWith(DependencyObject element, UIElement value)
             => element.SetValue(AlignRightWithProperty, value);
 
+        [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetAlignRightWith(DependencyObject element)
             => (UIElement) element.GetValue(AlignRightWithProperty);
 
@@ -90,6 +95,7 @@ namespace HandyControl.Controls
         public static void SetAlignBottomWith(DependencyObject element, UIElement value)
             => element.SetValue(AlignBottomWithProperty, value);
 
+        [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetAlignBottomWith(DependencyObject element)
             => (UIElement) element.GetValue(AlignBottomWithProperty);
 
@@ -103,6 +109,7 @@ namespace HandyControl.Controls
         public static void SetLeftOf(DependencyObject element, UIElement value)
             => element.SetValue(LeftOfProperty, value);
 
+        [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetLeftOf(DependencyObject element)
             => (UIElement)element.GetValue(LeftOfProperty);
 
@@ -112,6 +119,7 @@ namespace HandyControl.Controls
         public static void SetAbove(DependencyObject element, UIElement value)
             => element.SetValue(AboveProperty, value);
 
+        [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetAbove(DependencyObject element)
             => (UIElement)element.GetValue(AboveProperty);
 
@@ -121,6 +129,7 @@ namespace HandyControl.Controls
         public static void SetRightOf(DependencyObject element, UIElement value)
             => element.SetValue(RightOfProperty, value);
 
+        [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetRightOf(DependencyObject element)
             => (UIElement)element.GetValue(RightOfProperty);
 
@@ -130,6 +139,7 @@ namespace HandyControl.Controls
         public static void SetBelow(DependencyObject element, UIElement value)
             => element.SetValue(BelowProperty, value);
 
+        [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetBelow(DependencyObject element)
             => (UIElement) element.GetValue(BelowProperty);
 
@@ -161,6 +171,7 @@ namespace HandyControl.Controls
         public static void SetAlignHorizontalCenterWith(DependencyObject element, UIElement value)
             => element.SetValue(AlignHorizontalCenterWithProperty, value);
 
+        [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetAlignHorizontalCenterWith(DependencyObject element)
             => (UIElement)element.GetValue(AlignHorizontalCenterWithProperty);
 
@@ -170,6 +181,7 @@ namespace HandyControl.Controls
         public static void SetAlignVerticalCenterWith(DependencyObject element, UIElement value)
             => element.SetValue(AlignVerticalCenterWithProperty, value);
 
+        [TypeConverter(typeof(NameReferenceConverter))]
         public static UIElement GetAlignVerticalCenterWith(DependencyObject element)
             => (UIElement)element.GetValue(AlignVerticalCenterWithProperty);
 

From 0062c68847eaea4b3c8b2f83e995e06ab993ac3a Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 4 Feb 2020 12:53:29 +0800
Subject: [PATCH 33/41] fixed #189

---
 .../UserControl/Controls/NumericUpDownDemoCtl.xaml   |  2 +-
 .../Controls/Input/NumericUpDown.cs                  |  8 +++++++-
 .../Themes/Styles/Base/NumericUpDownBaseStyle.xaml   | 12 ++++++------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml
index 5036e772..7ac08446 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml
@@ -7,7 +7,7 @@
     <hc:TransitioningContentControl>
         <StackPanel Margin="32" Orientation="Horizontal">
             <StackPanel>
-                <hc:NumericUpDown/>
+                <hc:NumericUpDown Maximum="100"/>
                 <hc:NumericUpDown Margin="0,32,0,0" IsEnabled="False"/>
                 <hc:NumericUpDown Margin="0,32,0,0" IsReadOnly="True"/>
 
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
index 992adabf..d2e2b08b 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
@@ -13,18 +13,23 @@ namespace HandyControl.Controls
     ///     数值选择控件
     /// </summary>
     [TemplatePart(Name = ElementTextBox, Type = typeof(TextBox))]
+    [TemplatePart(Name = ElementErrorTip, Type = typeof(UIElement))]
     public class NumericUpDown : Control, IDataInput
     {
         #region Constants
 
         private const string ElementTextBox = "PART_TextBox";
 
+        private const string ElementErrorTip = "PART_ErrorTip";
+
         #endregion Constants
 
         #region Data
 
         private TextBox _textBox;
 
+        private UIElement _errorTip;
+
         private bool _updateText;
 
         #endregion Data
@@ -77,6 +82,7 @@ namespace HandyControl.Controls
             base.OnApplyTemplate();
 
             _textBox = GetTemplateChild(ElementTextBox) as TextBox;
+            _errorTip = GetTemplateChild(ElementErrorTip) as UIElement;
 
             if (_textBox != null)
             {
@@ -105,7 +111,7 @@ namespace HandyControl.Controls
 
         private void TextBox_LostFocus(object sender, RoutedEventArgs e)
         {
-            if (IsError) return;
+            if (IsError && _errorTip != null) return;
             _textBox.Text = CurrentText;
         }
 
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/NumericUpDownBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/NumericUpDownBaseStyle.xaml
index c69f0993..ae0f1b99 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/NumericUpDownBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/NumericUpDownBaseStyle.xaml
@@ -158,10 +158,10 @@
     <ControlTemplate x:Key="NumericUpDownPlusTopTemplate" TargetType="controls:NumericUpDown">
         <ControlTemplate.Resources>
             <Storyboard x:Key="StoryboardShow">
-                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2"/>
+                <ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2"/>
             </Storyboard>
             <Storyboard x:Key="StoryboardHidden">
-                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0"/>
+                <ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0"/>
             </Storyboard>
         </ControlTemplate.Resources>
         <Grid>
@@ -169,7 +169,7 @@
                 <RowDefinition Height="Auto"/>
                 <RowDefinition MinHeight="{Binding Path=(controls:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(controls:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}"/>
             </Grid.RowDefinitions>
-            <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1"/>
+            <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="PART_ErrorTip" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1"/>
             <StackPanel Grid.Row="0" Visibility="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" Orientation="Horizontal" Margin="{TemplateBinding Padding}">
                 <TextBlock Foreground="{TemplateBinding Foreground}" Margin="1,0,0,0" Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
@@ -225,10 +225,10 @@
     <ControlTemplate x:Key="NumericUpDownPlusLeftTemplate" TargetType="controls:NumericUpDown">
         <ControlTemplate.Resources>
             <Storyboard x:Key="StoryboardShow">
-                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2"/>
+                <ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2"/>
             </Storyboard>
             <Storyboard x:Key="StoryboardHidden">
-                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0"/>
+                <ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0"/>
             </Storyboard>
         </ControlTemplate.Resources>
         <Grid MinHeight="{Binding Path=(controls:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(controls:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
@@ -236,7 +236,7 @@
                 <ColumnDefinition Width="{Binding Path=(controls:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1"/>
+            <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="PART_ErrorTip" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1"/>
             <StackPanel Grid.Column="0" Visibility="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" Orientation="Horizontal" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="0,7,6,8">
                 <TextBlock Foreground="{TemplateBinding Foreground}" Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>

From 3e9614d7e74aca69f301e28bd6a8e81eff523ca2 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 4 Feb 2020 15:44:02 +0800
Subject: [PATCH 34/41] update PanelElement

---
 .../handycontrol/attach/panelElement/index.md  | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/doc/source/handycontrol/attach/panelElement/index.md b/doc/source/handycontrol/attach/panelElement/index.md
index ca12ad62..9267ff42 100644
--- a/doc/source/handycontrol/attach/panelElement/index.md
+++ b/doc/source/handycontrol/attach/panelElement/index.md
@@ -1,5 +1,19 @@
 ---
-title: 建设中
+title: PanelElement 面板元素
 ---
 
-建设中
\ No newline at end of file
+# 属性
+
+| 名称 | 用途 |
+|-|-|
+| FluidMoveBehavior | 设置面板的流体移动方式 |
+
+# 使用案例
+
+## FluidMoveBehavior 设置面板的流体移动方式
+
+```xml
+<hc:HoneycombPanel hc:PanelElement.FluidMoveBehavior="{StaticResource BehaviorXY200}"/>
+```
+
+当向面板容器中添加或移除元素时，就可以看到流体移动的动画效果。
\ No newline at end of file

From 0609c89245a5618cb9cb274a987085f48c4a6656 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 4 Feb 2020 15:44:19 +0800
Subject: [PATCH 35/41] add RectangleAttach

---
 .../attach/rectangleAttach/index.md           | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 doc/source/handycontrol/attach/rectangleAttach/index.md

diff --git a/doc/source/handycontrol/attach/rectangleAttach/index.md b/doc/source/handycontrol/attach/rectangleAttach/index.md
new file mode 100644
index 00000000..4999a04b
--- /dev/null
+++ b/doc/source/handycontrol/attach/rectangleAttach/index.md
@@ -0,0 +1,19 @@
+---
+title: RectangleAttach Rectangle专用
+---
+
+# 属性
+
+| 名称 | 用途 |
+|-|-|
+| CornerRadius | 设置Rectangle圆角值 |
+
+# 使用案例
+
+## CornerRadius 设置Rectangle圆角值
+
+```xml
+<Rectangle Fill="Red" Width="100" Height="60" hc:RectangleAttach.Circular="True"/>
+```
+
+![RectangleAttach.CornerRadius](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/attach/RectangleAttach.CornerRadius.png)
\ No newline at end of file

From ab2993a793107cc0245109d7ce5db74c1ad1821d Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 4 Feb 2020 15:44:45 +0800
Subject: [PATCH 36/41] add TextBlockAttach

---
 .../attach/textBlockAttach/index.md           | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 doc/source/handycontrol/attach/textBlockAttach/index.md

diff --git a/doc/source/handycontrol/attach/textBlockAttach/index.md b/doc/source/handycontrol/attach/textBlockAttach/index.md
new file mode 100644
index 00000000..bf355d3f
--- /dev/null
+++ b/doc/source/handycontrol/attach/textBlockAttach/index.md
@@ -0,0 +1,21 @@
+---
+title: TextBlockAttach 文本块专用
+---
+
+# 属性
+
+| 名称 | 用途 |
+|-|-|
+| AutoTooltip | 设置是否自动显示工具提示 |
+
+# 使用案例
+
+## AutoTooltip 设置是否自动显示工具提示
+
+```xml
+<hc:SimplePanel Width="100" VerticalAlignment="Center" HorizontalAlignment="Center">
+    <TextBlock hc:TextBlockAttach.AutoTooltip="True" Text="EEEEEEEEEEEEEEEEEEEE"/>
+</hc:SimplePanel>
+```
+
+![TextBlockAttach.AutoTooltip](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/attach/TextBlockAttach.AutoTooltip.png)
\ No newline at end of file

From 2b4fa8a8513d76e639a1df9a4cc048e24b91f5ba Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 4 Feb 2020 15:45:07 +0800
Subject: [PATCH 37/41] update Converters

---
 doc/source/handycontrol/basic_xaml/converters/index.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/source/handycontrol/basic_xaml/converters/index.md b/doc/source/handycontrol/basic_xaml/converters/index.md
index 33f62bde..6d256584 100644
--- a/doc/source/handycontrol/basic_xaml/converters/index.md
+++ b/doc/source/handycontrol/basic_xaml/converters/index.md
@@ -50,6 +50,14 @@ title: 转换器
 
 该转换器需要提供一个字符串作为参数，该字符串的一般形式为：`[0/1],[0/1],[0/1],[0/1]`，4个以逗号分隔的值分别对应`CornerRadius`的`Left`、`Top`，`Right`，`Bottom`属性，当值为1则返回对应属性的值，否则返回0。
 
+# Double2GridLengthConverter
+
+该转换器会将`double`值转换为`GridLength`。
+
+# DoubleMinConverter（内部使用）
+
+可以向该转换器提供一个字符串作为最小值（如果不提供，则最小值默认为0），当传入的值小于最小值时，返回最小值，否则返回传入的值。
+
 # Int2StrConverter
 
 该转换器需要提供一个字符串作为参数，该字符串的一般形式为：`[字符串0];[字符串1];...[字符串n]`，转换器会将一个整型的值作为索引，来获取指定位置的字符串并返回。

From 77a399a1a6bb401f3ca48b71ab7a06e6feedadaa Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 4 Feb 2020 15:45:27 +0800
Subject: [PATCH 38/41] update sizes

---
 doc/source/handycontrol/basic_xaml/sizes/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/source/handycontrol/basic_xaml/sizes/index.md b/doc/source/handycontrol/basic_xaml/sizes/index.md
index e8b38ee2..2fbb6e0f 100644
--- a/doc/source/handycontrol/basic_xaml/sizes/index.md
+++ b/doc/source/handycontrol/basic_xaml/sizes/index.md
@@ -5,7 +5,7 @@ title: 尺寸
 | 名称 | 类型 | 值 | 描述 |
 |-|-|
 | DefaultControlHeight | System.Double | 30 | 默认控件高度 |
-| DefaultControlPadding | System.Windows.Thickness | 12,6 | 默认控件内边距 |
+| DefaultControlPadding | System.Windows.Thickness | 10,6 | 默认控件内边距 |
 | DefaultInputPadding | System.Windows.Thickness | 8,6 |默认输入控件内边距 |
 | DefaultCornerRadius | System.Windows.CornerRadius | 4 | 默认圆角 |
 

From b19436985c89e9cd1d5a85c3ae064fd8fa487ea3 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 4 Feb 2020 15:45:43 +0800
Subject: [PATCH 39/41] Update _config.yml

---
 doc/themes/next/_config.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/themes/next/_config.yml b/doc/themes/next/_config.yml
index a18b3b35..59861b1e 100644
--- a/doc/themes/next/_config.yml
+++ b/doc/themes/next/_config.yml
@@ -158,7 +158,7 @@ baidu_push: false
 # External url should start with http:// or https://
 menu:
   主页: / || 
-  HandyControl:
+  HandyControl - 2.4.0:
     default: /handycontrol/ ||
     鸣谢: /tnx/ ||
     快速开始: /quick_start/ ||
@@ -184,7 +184,9 @@ menu:
       InfoElement 信息元素: /infoElement/ ||
       PanelElement 面板元素: /panelElement/ ||
       PasswordBoxAttach 密码框专用: /passwordBoxAttach/ ||
+      RectangleAttach Rectangle专用: /rectangleAttach/ ||
       StatusSwitchElement 可切换状态的元素: /statusSwitchElement/ ||
+      TextBlockAttach 文本块专用: /textBlockAttach/ ||
       TipElement 提示元素: /tipElement/ ||
       TitleElement 标题元素: /titleElement/ ||
       VisualElement 可视化元素: /visualElement/ ||

From 44b6d64e0aa4397dea33d39e3ffa2bcde574ce83 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 4 Feb 2020 16:04:42 +0800
Subject: [PATCH 40/41] update ChatBox

---
 .../UserControl/Basic/ChatBox.xaml            |  2 +-
 .../UserControl/Basic/ChatBox.xaml.cs         | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml
index 2615146f..c8e06311 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml
@@ -16,7 +16,7 @@
             <RowDefinition/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <ListBox ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.CanContentScroll="False"  Background="Transparent" hc:ChatBubble.MaxWidth="300" BorderThickness="0" Style="{StaticResource StackPanelVerticalListBox}" ItemsSource="{Binding ChatInfos}">
+        <ListBox Name="ListBoxChat" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.CanContentScroll="False" Background="Transparent" hc:ChatBubble.MaxWidth="300" BorderThickness="0" Style="{StaticResource StackPanelVerticalListBox}" ItemsSource="{Binding ChatInfos}">
             <hc:Interaction.Triggers>
                 <hc:RoutedEventTrigger RoutedEvent="hc:ChatBubble.Selected">
                     <hc:EventToCommand Command="{Binding ReadMessageCmd}" PassEventArgsToCommand="True" />
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml.cs
index affe29d0..10a70ab1 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml.cs
@@ -1,10 +1,27 @@
-namespace HandyControlDemo.UserControl
+using System.Windows.Controls;
+using HandyControl.Tools;
+
+namespace HandyControlDemo.UserControl
 {
     public partial class ChatBox
     {
+        private ScrollViewer _scrollViewer;
+
         public ChatBox()
         {
             InitializeComponent();
+
+            ListBoxChat.ItemContainerGenerator.ItemsChanged += ItemContainerGenerator_ItemsChanged;
+        }
+
+        private void ItemContainerGenerator_ItemsChanged(object sender, System.Windows.Controls.Primitives.ItemsChangedEventArgs e)
+        {
+            if (_scrollViewer == null)
+            {
+                _scrollViewer = VisualHelper.GetChild<ScrollViewer>(ListBoxChat);
+            }
+
+            _scrollViewer?.ScrollToBottom();
         }
     }
 }

From aa6587022baabf082a41dce1661da1c585a88c24 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 5 Feb 2020 17:44:02 +0800
Subject: [PATCH 41/41] merged pr

---
 .../native_controls/richTextBox/index.md      | 33 ++++---------------
 .../native_controls/scrollViewer/index.md     | 10 ++----
 .../native_controls/slider/index.md           |  7 ++--
 .../native_controls/tabControl/index.md       | 26 +++++++--------
 doc/themes/next/_config.yml                   |  2 +-
 .../analytics/cnzz-analytics.swig             |  4 +--
 6 files changed, 23 insertions(+), 59 deletions(-)

diff --git a/doc/source/handycontrol/native_controls/richTextBox/index.md b/doc/source/handycontrol/native_controls/richTextBox/index.md
index 6e8e2621..3e33e5e1 100644
--- a/doc/source/handycontrol/native_controls/richTextBox/index.md
+++ b/doc/source/handycontrol/native_controls/richTextBox/index.md
@@ -4,39 +4,18 @@ title: RichTextBox 富文本框
 
 # TextBoxBaseBaseStyle
 
-该样式属于文本框基础样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+基础文本控件默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+# RichTextBoxBaseStyle : TextBoxBaseBaseStyle
+
+富文本框默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
 
 案例：
 
-```xml
-<Style x:Key="RichTextBoxBaseStyle" BasedOn="{StaticResource TextBoxBaseBaseStyle}" TargetType="RichTextBox">
-   <Setter Property="MinWidth" Value="10"/>
-</Style>
-```
-
-# RichTextBoxBaseStyle:TextBoxBaseBaseStyle
-
-富文本框的基础样式，作为默认富文本框的基类样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用
-
-案例：
-
-```xml
-<Style BasedOn="{StaticResource RichTextBoxBaseStyle}" TargetType="RichTextBox"/>
-```
-
-`xaml`中：
-
 ```xml
 <RichTextBox Margin="10,10" VerticalAlignment="Center" HorizontalAlignment="Center"></RichTextBox>
 ```
 
-
-
 效果：
 
-![RichTextbox.DefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RichTextbox.DefaultStyle.png)
-
-
-
-
-
+![RichTextbox.DefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RichTextbox.DefaultStyle.png)
\ No newline at end of file
diff --git a/doc/source/handycontrol/native_controls/scrollViewer/index.md b/doc/source/handycontrol/native_controls/scrollViewer/index.md
index c7223b6d..8d39838d 100644
--- a/doc/source/handycontrol/native_controls/scrollViewer/index.md
+++ b/doc/source/handycontrol/native_controls/scrollViewer/index.md
@@ -4,16 +4,10 @@ title: ScrollViewer 滚动视图
 
 # ScrollViewerNativeBaseStyle
 
-滚动视图的基础样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+原生滚动视图默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
 
 案例：
 
-```xml
-<Style BasedOn="{StaticResource ScrollViewerNativeBaseStyle}" TargetType="ScrollViewer"/>
-```
-
-`xaml`中：
-
 ```xml
 <ScrollViewer>
    <Grid Height="500">
@@ -33,7 +27,7 @@ title: ScrollViewer 滚动视图
 案例：
 
 ```xml
-<ScrollViewer Style="{DynamicResource ScrollViewerUpDown}">
+<ScrollViewer Style="{StaticResource ScrollViewerUpDown}">
     <StackPanel Height="500">
         <TextBlock Text="内容区域" Height="250"></TextBlock>
         <TextBlock Text="内容区域" Height="250"></TextBlock>
diff --git a/doc/source/handycontrol/native_controls/slider/index.md b/doc/source/handycontrol/native_controls/slider/index.md
index db0474b3..3ffd997e 100644
--- a/doc/source/handycontrol/native_controls/slider/index.md
+++ b/doc/source/handycontrol/native_controls/slider/index.md
@@ -4,15 +4,12 @@ title: Slider 滑块
 
 # SliderBaseStyle
 
-滑块基础样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+滑块默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
 
 案例：
 
 ```xml
-<UniformGrid.Resources>
-    <Style BasedOn="{StaticResource SliderBaseStyle}" TargetType="Slider"/>
-</UniformGrid.Resources>
-<Slider Margin="10,30"></Slider>
+<Slider VerticalAlignment="Center" Width="400" Value="40" Maximum="100"/>
 ```
 
 效果：
diff --git a/doc/source/handycontrol/native_controls/tabControl/index.md b/doc/source/handycontrol/native_controls/tabControl/index.md
index 0f8c5440..1c2ac558 100644
--- a/doc/source/handycontrol/native_controls/tabControl/index.md
+++ b/doc/source/handycontrol/native_controls/tabControl/index.md
@@ -4,16 +4,10 @@ title: TabControl 选项卡控件
 
 # TabControlBaseStyle
 
-选项卡控件默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用
+选项卡控件默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
 
 案例：
 
-```xml
-<Style BasedOn="{StaticResource TabControlBaseStyle}" TargetType="TabControl"/>
-```
-
-`xaml`中：
-
  ```xml
 <TabControl Margin="10">
     <TabItem Header="选项卡1">
@@ -29,14 +23,14 @@ title: TabControl 选项卡控件
 
 ![TabControl.DefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TabControl.DefaultStyle.png)
 
-# TabControlInLine
+# TabControlInLine : TabControlBaseStyle
 
-行内选中选项卡样式
+单行填充选项卡样式
 
 案例：
 
 ```xml
-<TabControl Margin="10" Style="{DynamicResource TabControlInLine}">
+<TabControl Margin="10" Style="{StaticResource TabControlInLine}">
     <TabItem Header="选项卡1">
     </TabItem>
     <TabItem Header="选项卡2">
@@ -52,12 +46,12 @@ title: TabControl 选项卡控件
 
 # TabControlCapsule
 
-简约选项卡样式
+胶囊状选项卡样式
 
 案例：
 
 ```xml
-<TabControl Margin="10" Style="{DynamicResource TabControlCapsule}">
+<TabControl Margin="10" Style="{StaticResource TabControlCapsule}">
     <TabItem Header="选项卡1">
     </TabItem>
     <TabItem Header="选项卡2">
@@ -71,12 +65,14 @@ title: TabControl 选项卡控件
 
 ![TabControl.CapsuleStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TabControl.CapsuleStyle.png)
 
-# TabControlCapsuleSolid
+# TabControlCapsuleSolid : TabControlCapsule
+
+胶囊状（实心）选项卡样式
 
 案例：
 
 ```xml
-<TabControl Margin="10" Style="{DynamicResource TabControlCapsuleSolid}">
+<TabControl Margin="10" Style="{StaticResource TabControlCapsuleSolid}">
     <TabItem Header="选项卡1">
     </TabItem>
     <TabItem Header="选项卡2">
@@ -92,6 +88,6 @@ title: TabControl 选项卡控件
 
 # 温馨提示
 
-使用属性`TabStripPlacement`设定头部标题的位置，效果如下：
+可以使用属性`TabStripPlacement`设定头部标题的位置，效果如下：
 
 ![TabControl.TabStripPlacement](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TabControl.TabStripPlacement.png)
\ No newline at end of file
diff --git a/doc/themes/next/_config.yml b/doc/themes/next/_config.yml
index a18b3b35..d7de53b9 100644
--- a/doc/themes/next/_config.yml
+++ b/doc/themes/next/_config.yml
@@ -872,7 +872,7 @@ needmoreshare2:
 #  localhost_ignored: true
 
 # CNZZ count
-#cnzz_siteid:
+cnzz_siteid: 1278600916
 
 # Application Insights
 # See: https://azure.microsoft.com/en-us/services/application-insights
diff --git a/doc/themes/next/layout/_third-party/analytics/cnzz-analytics.swig b/doc/themes/next/layout/_third-party/analytics/cnzz-analytics.swig
index 9693cda2..f9519141 100644
--- a/doc/themes/next/layout/_third-party/analytics/cnzz-analytics.swig
+++ b/doc/themes/next/layout/_third-party/analytics/cnzz-analytics.swig
@@ -1,5 +1,3 @@
 {% if theme.cnzz_siteid %}
-  <div style="display: none;">
-    <script src="//s95.cnzz.com/z_stat.php?id={{ theme.cnzz_siteid }}&web_id={{ theme.cnzz_siteid }}"></script>
-  </div>
+  <script type="text/javascript">var cnzz_protocol = (("https:" == document.location.protocol) ? "https://" : "http://");document.write(unescape("%3Cspan id='cnzz_stat_icon_{{ theme.cnzz_siteid }}'%3E%3C/span%3E%3Cscript src='" + cnzz_protocol + "s4.cnzz.com/z_stat.php%3Fid%3D{{ theme.cnzz_siteid }}%26online%3D1%26show%3Dline' type='text/javascript'%3E%3C/script%3E"));</script>
 {% endif %}