From d90bac7b21e3c3d5e98575c3a61a73f72e0fdaa5 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Sun, 7 Apr 2019 21:44:58 -0400
Subject: [PATCH 01/29] Bind window height to ViewModel

---
 .../View/DisplayLayoutWindow.xaml             |  2 +-
 .../ViewModel/DisplayLayoutViewModel.cs       | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
index d27bf1c5..6eddff28 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
@@ -6,7 +6,7 @@
     xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
     xmlns:command="http://www.galasoft.ch/mvvmlight"
     x:Class="InvvardDev.EZLayoutDisplay.Desktop.View.DisplayLayoutWindow"
-    mc:Ignorable="d" Height="423" Width="1075"
+    mc:Ignorable="d" Height="{Binding WindowHeight}" Width="1075"
     WindowStartupLocation="CenterScreen"
     ResizeMode="NoResize" Visibility="Visible" ShowInTaskbar="True"
     WindowStyle="None" Background="{StaticResource WindowBackgroundBrush}"
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
index c7d20386..118d46e0 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
 using System.Windows.Input;
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.CommandWpf;
@@ -22,6 +23,12 @@ namespace InvvardDev.EZLayoutDisplay.Desktop.ViewModel
 {
     public class DisplayLayoutViewModel : ViewModelBase
     {
+        #region Constants
+
+        private const int NonResizableWindowHeight = 423;
+        private const int ResizableWindowHeight = 423;
+
+        #endregion
         #region Fields
 
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
@@ -38,6 +45,8 @@ public class DisplayLayoutViewModel : ViewModelBase
         private int _currentLayerIndex;
         private EZLayout _ezLayout;
 
+        private int _windowHeight;
+
         private string _windowTitle;
         private string _noLayoutWarningFirstLine;
         private string _noLayoutWarningSecondLine;
@@ -131,6 +140,15 @@ public int CurrentLayerIndex
             private set => Set(ref _currentLayerIndex, value);
         }
 
+        /// <summary>
+        /// Gets or sets the window's height.
+        /// </summary>
+        public int WindowHeight
+        {
+            get => _windowHeight;
+            private set => Set(ref _windowHeight, value);
+        }
+
         #endregion
 
         #region Relay commands
@@ -164,6 +182,7 @@ public DisplayLayoutViewModel(IWindowService windowService, ILayoutService layou
             CurrentLayoutTemplate = new ObservableCollection<KeyTemplate>();
 
             SetLabelUi();
+            SetWindowParameters();
             LoadCompleteLayout();
         }
 
@@ -179,6 +198,11 @@ private void SetLabelUi()
             ControlHintLabel = "Press 'Space' to display next layer";
         }
 
+        private void SetWindowParameters()
+        {
+            WindowHeight = NonResizableWindowHeight;
+        }
+
         private async void LoadCompleteLayout()
         {
             Logger.TraceMethod();

From 4b73df362ff6c998b90274fa17786f12e55c5b52 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Sun, 7 Apr 2019 21:56:14 -0400
Subject: [PATCH 02/29] Bind window resize mode to ViewModel

---
 .../View/DisplayLayoutWindow.xaml                     |  2 +-
 .../ViewModel/DisplayLayoutViewModel.cs               | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
index 6eddff28..f7aee413 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
@@ -8,7 +8,7 @@
     x:Class="InvvardDev.EZLayoutDisplay.Desktop.View.DisplayLayoutWindow"
     mc:Ignorable="d" Height="{Binding WindowHeight}" Width="1075"
     WindowStartupLocation="CenterScreen"
-    ResizeMode="NoResize" Visibility="Visible" ShowInTaskbar="True"
+    ResizeMode="{Binding WindowResizeMode}" Visibility="Visible" ShowInTaskbar="True"
     WindowStyle="None" Background="{StaticResource WindowBackgroundBrush}"
     Title="{Binding WindowTitle}" Icon="{StaticResource WindowIcon}"
     DataContext="{Binding DisplayLayout, Source={StaticResource Locator}}">
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
index 118d46e0..756813e6 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
@@ -46,6 +46,7 @@ public class DisplayLayoutViewModel : ViewModelBase
         private EZLayout _ezLayout;
 
         private int _windowHeight;
+        private ResizeMode _windowResizeMode;
 
         private string _windowTitle;
         private string _noLayoutWarningFirstLine;
@@ -149,6 +150,15 @@ public int WindowHeight
             private set => Set(ref _windowHeight, value);
         }
 
+        /// <summary>
+        /// Gets or sets the window's resize mode.
+        /// </summary>
+        public ResizeMode WindowResizeMode
+        {
+            get => _windowResizeMode;
+            private set => Set(ref _windowResizeMode, value);
+        }
+
         #endregion
 
         #region Relay commands
@@ -200,6 +210,7 @@ private void SetLabelUi()
 
         private void SetWindowParameters()
         {
+            WindowResizeMode = ResizeMode.NoResize;
             WindowHeight = NonResizableWindowHeight;
         }
 

From 225505beb41b0a79cbbd6d4d21c9ce79668cb16b Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Sun, 7 Apr 2019 21:59:07 -0400
Subject: [PATCH 03/29] Bind window' style to ViewModel

---
 .../View/DisplayLayoutWindow.xaml                    |  2 +-
 .../ViewModel/DisplayLayoutViewModel.cs              | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
index f7aee413..6eddff28 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
@@ -8,7 +8,7 @@
     x:Class="InvvardDev.EZLayoutDisplay.Desktop.View.DisplayLayoutWindow"
     mc:Ignorable="d" Height="{Binding WindowHeight}" Width="1075"
     WindowStartupLocation="CenterScreen"
-    ResizeMode="{Binding WindowResizeMode}" Visibility="Visible" ShowInTaskbar="True"
+    ResizeMode="NoResize" Visibility="Visible" ShowInTaskbar="True"
     WindowStyle="None" Background="{StaticResource WindowBackgroundBrush}"
     Title="{Binding WindowTitle}" Icon="{StaticResource WindowIcon}"
     DataContext="{Binding DisplayLayout, Source={StaticResource Locator}}">
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
index 756813e6..b80bf2ad 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
@@ -46,7 +46,7 @@ public class DisplayLayoutViewModel : ViewModelBase
         private EZLayout _ezLayout;
 
         private int _windowHeight;
-        private ResizeMode _windowResizeMode;
+        private WindowStyle _windowStyle;
 
         private string _windowTitle;
         private string _noLayoutWarningFirstLine;
@@ -151,12 +151,12 @@ public int WindowHeight
         }
 
         /// <summary>
-        /// Gets or sets the window's resize mode.
+        /// Gets or sets the window' style.
         /// </summary>
-        public ResizeMode WindowResizeMode
+        public WindowStyle WindowStyle
         {
-            get => _windowResizeMode;
-            private set => Set(ref _windowResizeMode, value);
+            get => _windowStyle;
+            private set => Set(ref _windowStyle, value);
         }
 
         #endregion
@@ -210,7 +210,7 @@ private void SetLabelUi()
 
         private void SetWindowParameters()
         {
-            WindowResizeMode = ResizeMode.NoResize;
+            WindowStyle = WindowStyle.None;
             WindowHeight = NonResizableWindowHeight;
         }
 

From 22bdab9e18eaae5347ff17db2ae8a5300a3cb7b0 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Sun, 7 Apr 2019 22:05:07 -0400
Subject: [PATCH 04/29] Bind window style to VM

---
 .../View/DisplayLayoutWindow.xaml                               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
index 6eddff28..39045a42 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
@@ -9,7 +9,7 @@
     mc:Ignorable="d" Height="{Binding WindowHeight}" Width="1075"
     WindowStartupLocation="CenterScreen"
     ResizeMode="NoResize" Visibility="Visible" ShowInTaskbar="True"
-    WindowStyle="None" Background="{StaticResource WindowBackgroundBrush}"
+    WindowStyle="{Binding WindowStyle}" Background="{StaticResource WindowBackgroundBrush}"
     Title="{Binding WindowTitle}" Icon="{StaticResource WindowIcon}"
     DataContext="{Binding DisplayLayout, Source={StaticResource Locator}}">
 

From e9b6f40ec032a50242842b5c958c30d19c64b0a7 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Sun, 7 Apr 2019 22:11:57 -0400
Subject: [PATCH 05/29] Move data context declaration

---
 .../View/DisplayLayoutWindow.xaml                             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
index 39045a42..d87b861a 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
@@ -6,12 +6,12 @@
     xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
     xmlns:command="http://www.galasoft.ch/mvvmlight"
     x:Class="InvvardDev.EZLayoutDisplay.Desktop.View.DisplayLayoutWindow"
+    DataContext="{Binding DisplayLayout, Source={StaticResource Locator}}"
     mc:Ignorable="d" Height="{Binding WindowHeight}" Width="1075"
     WindowStartupLocation="CenterScreen"
     ResizeMode="NoResize" Visibility="Visible" ShowInTaskbar="True"
     WindowStyle="{Binding WindowStyle}" Background="{StaticResource WindowBackgroundBrush}"
-    Title="{Binding WindowTitle}" Icon="{StaticResource WindowIcon}"
-    DataContext="{Binding DisplayLayout, Source={StaticResource Locator}}">
+    Title="{Binding WindowTitle}" Icon="{StaticResource WindowIcon}">
 
     <Window.Resources>
         <ResourceDictionary>

From 72f560c4ebb90052ae3a5859534d47aa20c8efd5 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Tue, 9 Apr 2019 20:46:07 -0400
Subject: [PATCH 06/29] Add the non pin window height constant value

---
 .../ViewModel/DisplayLayoutViewModel.cs                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
index b80bf2ad..5137fe4b 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
@@ -26,7 +26,7 @@ public class DisplayLayoutViewModel : ViewModelBase
         #region Constants
 
         private const int NonResizableWindowHeight = 423;
-        private const int ResizableWindowHeight = 423;
+        private const int ResizableWindowHeight = 453;
 
         #endregion
         #region Fields

From 104a3e94705921f712562d3cd28732c26b17ce1f Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Tue, 9 Apr 2019 21:23:46 -0400
Subject: [PATCH 07/29] Add the pin and pin.remove icom

---
 .../InvvardDev.EZLayoutDisplay.Desktop.csproj     |   4 ++++
 .../Skins/Images/pin.png                          | Bin 0 -> 626 bytes
 .../Skins/Images/pin.remove.png                   | Bin 0 -> 791 bytes
 3 files changed, 4 insertions(+)
 create mode 100644 src/InvvardDev.EZLayoutDisplay.Desktop/Skins/Images/pin.png
 create mode 100644 src/InvvardDev.EZLayoutDisplay.Desktop/Skins/Images/pin.remove.png

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/InvvardDev.EZLayoutDisplay.Desktop.csproj b/src/InvvardDev.EZLayoutDisplay.Desktop/InvvardDev.EZLayoutDisplay.Desktop.csproj
index 15f461e7..d5f60982 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/InvvardDev.EZLayoutDisplay.Desktop.csproj
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/InvvardDev.EZLayoutDisplay.Desktop.csproj
@@ -269,6 +269,10 @@
   <ItemGroup>
     <Resource Include="Skins\Images\warning-sign.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Skins\Images\pin.png" />
+    <Resource Include="Skins\Images\pin.remove.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/Images/pin.png b/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/Images/pin.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba2c09ccb0ebeb7dbda4226c4b5568c9eb14a493
GIT binary patch
literal 626
zcmeAS@N?(olHy`uVBq!ia0vp^J|N7&1|*M957Y)yjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1qt-3{32vE{-7;ac^h&YO@B)wCi_nn6T-yP^z-#
z&6^&P9!k}zPqjVvHMOp(WlT*?UZ@jbrt>yeM@J;GL+8WqyVn1$e4pQ&xwCxFnK}1^
z{f*0a&91ciT$ZNg#G%+C04F@0!?%cN&S)twSoX_XrHE<&1L2S@EEc;YP6Mg31=4TM
zFWTyU`hVa1l>7YWAFOxN_S$efL-M)*BGE=c344{;QorICEypj2p9;O`a4RD1!o^L;
zjGB9{<>(l%$XE+xc1#P``7HPC(4j*LmkT7%9WK1V=y`ABx(6a>rf$pldD-Ax*p@dB
z+1T$*kvn9#;}Eap&W6_of_w+fD>(BXsOyNxn6h6mXZrL(M(o#wZezyEPha2Wte&Pf
z?Vxt(y^CJbr%xD1y-b#@bm3N;cF}9ggCxnbF5G6*4rZLcAb$M09?vY+AB?qyHFgIQ
z9zOP(b}^Oj@B@jK8ig|F4<DbZZae#2hlgw4mh}szAByT7G!bXA(`IA7?{_p^sUj{(
zLs@gy@B5cFv)`S&ztzU(@s;jxe9b=vQiXR}*K@Ha*w$S9@y?Lr*@Eid2Ug1Y{ZtX`
zKgN0dk}+5A@=Db^ZISo3L~mLAYW<|cfhplGah%r^j6cj<yL($y-Z#bMkIWY59(J>>
zaXR+MrdHm(<JgDXvu?SeDhI1oYj<cPMUH^e6W^tuc=-+5vTm<8y#Y)o44$rjF6*2U
FngG)p4A}qx

literal 0
HcmV?d00001

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/Images/pin.remove.png b/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/Images/pin.remove.png
new file mode 100644
index 0000000000000000000000000000000000000000..1981c5bfb6f637fb3c844226827f946729fea00e
GIT binary patch
literal 791
zcmV+y1L*vTP)<h;3K|Lk000e1NJLTq002w?002w~1^@s6$Cptn00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0<1|yK~#8N?V8Wa
z4N)A2FNsiCVB<%WjijV3q$ENT*;pwH*;z|=))un%4=5`e3uWO|Hk6IMjfDk~g~$S*
z&wJ-vr*CKO%suzK^EzifPd&}Ob8pi<PjhGPoVgPrgb+dqA%qZ%upXYCJ``Or)>HTg
z-rx$+j>Y=hsAx0ru@tR?WAHch!4z!<SD>QJiJ~Q-XbB7*Z9}sxnxUc{f*;_~<!6O6
zM6_p++xrR?tpn~|;r0}*gS*ggPtj&@55~5qXf51=v29UBi?A2Qwqq(<K-&esSJ6P<
zSmr3AeStfnXWm$5HPOz(t8fq8+;|Z3_~c2AWmXfd4~xb!M-eSoEb}Aeo?I*pas*z4
zr{Dp&4wBrlUc<vMD{GqNO2as}o8>012>1*i!~O6QSIo&0yavz1-S8)T1>ZuRg^PlF
z%_A7w19JEh7X6j;@GQuKZ)~uOT3sxIXR6%Ms*Ppjj8=UtBS*B+#4;9%Ho90wO0?0&
zG8pX}jKzt0A9}Vm%TaI!w#{C|`~*YxLC$idOm`OtFIVQ-yG+h<7`&w7x|HeeqSys_
zK^%tQpuf9yF^@xI3$*psM&m*I4GbgvfEQq&69KOkjU6z2t-5Gyp`VH1afzXfu4v(V
zeK1;8v<EO8+<VBcr>8C2FBtw2g|i<1J+z8wH(@xa=Wsi0BNpui3^@sN-NO5?@B`yi
z52t*(@X<Ko=*fMvc-7%=B^xvca0l{O))$NRWcgW~YNBy3vNIyjgdA83{LQv;`mmKM
zqCJHC!2AOo=kQmWqN81g{Ggnt-^vvOQEW8ct+_sZI5@>c<8P(a{^M>H$F!kQv;-6_
z0YyuoE800I9Bt8fjoRl@ZIt+E@8GC!tn|U6amGZkdU68lYbb;eLI@#*5UETi{{Toh
VkzfL?ZlC}F002ovPDHLkV1fx?X-EJ7

literal 0
HcmV?d00001


From ab92e753fb6e54709b3d8b0590bac187cc7653ae Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Tue, 9 Apr 2019 22:40:46 -0400
Subject: [PATCH 08/29] Create the pin toggle button

---
 .../View/DisplayLayoutWindow.xaml             | 70 +++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
index d87b861a..d5a52444 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
@@ -19,6 +19,75 @@
                 <ResourceDictionary Source="../Skins/KeyboardLayoutSkin.xaml" />
                 <ResourceDictionary Source="../Skins/DisplayLayoutSkin.xaml" />
             </ResourceDictionary.MergedDictionaries>
+            <Style x:Key="FocusVisual">
+                <Setter Property="Control.Template">
+                    <Setter.Value>
+                        <ControlTemplate>
+                            <Rectangle Margin="2" SnapsToDevicePixels="true" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+            <SolidColorBrush x:Key="Button.Static.Background" Color="#FFDDDDDD"/>
+            <SolidColorBrush x:Key="Button.Static.Border" Color="#FF707070"/>
+            <SolidColorBrush x:Key="Button.MouseOver.Background" Color="#FFBEE6FD"/>
+            <SolidColorBrush x:Key="Button.MouseOver.Border" Color="#FF3C7FB1"/>
+            <SolidColorBrush x:Key="Button.Pressed.Background" Color="#FFC4E5F6"/>
+            <SolidColorBrush x:Key="Button.Pressed.Border" Color="#FF2C628B"/>
+            <SolidColorBrush x:Key="Button.Disabled.Background" Color="#FFF4F4F4"/>
+            <SolidColorBrush x:Key="Button.Disabled.Border" Color="#FFADB2B5"/>
+            <SolidColorBrush x:Key="Button.Disabled.Foreground" Color="#FF838383"/>
+            <Style x:Key="ToggleButtonStyle1" TargetType="{x:Type ToggleButton}">
+                <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
+                <Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
+                <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+                <Setter Property="BorderThickness" Value="1"/>
+                <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                <Setter Property="VerticalContentAlignment" Value="Center"/>
+                <Setter Property="Padding" Value="1"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type ToggleButton}">
+                            <ControlTemplate.Resources>
+                                <Storyboard x:Key="Storyboard1"/>
+                            </ControlTemplate.Resources>
+                            <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true" HorizontalAlignment="Right" Cursor="Hand">
+                                <StackPanel Width="100" VerticalAlignment="Center" Orientation="Horizontal" Margin="5,0">
+                                    <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                                    <Image x:Name="toggleIcon" Height="{TemplateBinding Height}" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="10,0,0,0"/>
+                                </StackPanel>
+                            </Border>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="Button.IsDefaulted" Value="true">
+                                    <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                                    <Setter Property="Source" TargetName="toggleIcon" Value="/InvvardDev.EZLayoutDisplay.Desktop;component/Skins/Images/pin.png"/>
+                                </Trigger>
+                                <Trigger Property="IsMouseOver" Value="true">
+                                    <Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
+                                    <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
+                                </Trigger>
+                                <Trigger Property="IsChecked" Value="False">
+                                    <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Static.Background}"/>
+                                    <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
+                                    <Setter Property="Source" TargetName="toggleIcon" Value="/InvvardDev.EZLayoutDisplay.Desktop;component/Skins/Images/pin.png"/>
+                                </Trigger>
+                                <Trigger Property="IsChecked" Value="True">
+                                    <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
+                                    <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
+                                    <Setter Property="Source" TargetName="toggleIcon" Value="/InvvardDev.EZLayoutDisplay.Desktop;component/Skins/Images/pin.remove.png"/>
+                                </Trigger>
+                                <Trigger Property="IsEnabled" Value="false">
+                                    <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
+                                    <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
+                                    <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
+                                    <Setter Property="Source" TargetName="toggleIcon" Value="/InvvardDev.EZLayoutDisplay.Desktop;component/Skins/Images/pin.remove.png"/>
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
         </ResourceDictionary>
     </Window.Resources>
 
@@ -51,6 +120,7 @@
 
         <StackPanel Style="{StaticResource SpControlHintStyle}"
             Visibility="{Binding NoLayoutAvailable, Converter={StaticResource BoolToVisibleConverter}}">
+            <ToggleButton Height="32" VerticalContentAlignment="Center" Content="Pin window" Style="{DynamicResource ToggleButtonStyle1}"/>
             <TextBlock Text="{Binding ControlHintLabel}" Style="{StaticResource TbControlHintStyle}" />
         </StackPanel>
 

From e829ecf6042814813167fcd116930930d6880faa Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Tue, 9 Apr 2019 22:51:31 -0400
Subject: [PATCH 09/29] fix triggers

---
 .../View/DisplayLayoutWindow.xaml                 | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
index d5a52444..67c4de86 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
@@ -49,9 +49,6 @@
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type ToggleButton}">
-                            <ControlTemplate.Resources>
-                                <Storyboard x:Key="Storyboard1"/>
-                            </ControlTemplate.Resources>
                             <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true" HorizontalAlignment="Right" Cursor="Hand">
                                 <StackPanel Width="100" VerticalAlignment="Center" Orientation="Horizontal" Margin="5,0">
                                     <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
@@ -63,13 +60,11 @@
                                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
                                     <Setter Property="Source" TargetName="toggleIcon" Value="/InvvardDev.EZLayoutDisplay.Desktop;component/Skins/Images/pin.png"/>
                                 </Trigger>
-                                <Trigger Property="IsMouseOver" Value="true">
-                                    <Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
-                                    <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
+                                <Trigger Property="IsPressed" Value="true">
+                                    <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
+                                    <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
                                 </Trigger>
                                 <Trigger Property="IsChecked" Value="False">
-                                    <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Static.Background}"/>
-                                    <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
                                     <Setter Property="Source" TargetName="toggleIcon" Value="/InvvardDev.EZLayoutDisplay.Desktop;component/Skins/Images/pin.png"/>
                                 </Trigger>
                                 <Trigger Property="IsChecked" Value="True">
@@ -77,6 +72,10 @@
                                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
                                     <Setter Property="Source" TargetName="toggleIcon" Value="/InvvardDev.EZLayoutDisplay.Desktop;component/Skins/Images/pin.remove.png"/>
                                 </Trigger>
+                                <Trigger Property="IsMouseOver" Value="true">
+                                    <Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
+                                    <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
+                                </Trigger>
                                 <Trigger Property="IsEnabled" Value="false">
                                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
                                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>

From 776ad73bcdeb454d598b2e7f63496f556f6300c6 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Tue, 9 Apr 2019 22:53:21 -0400
Subject: [PATCH 10/29] Rename toggle button style

---
 .../View/DisplayLayoutWindow.xaml                         | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
index 67c4de86..7969ed5b 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
@@ -37,7 +37,7 @@
             <SolidColorBrush x:Key="Button.Disabled.Background" Color="#FFF4F4F4"/>
             <SolidColorBrush x:Key="Button.Disabled.Border" Color="#FFADB2B5"/>
             <SolidColorBrush x:Key="Button.Disabled.Foreground" Color="#FF838383"/>
-            <Style x:Key="ToggleButtonStyle1" TargetType="{x:Type ToggleButton}">
+            <Style x:Key="ToggleButtonPinWindowStyle" TargetType="{x:Type ToggleButton}">
                 <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
                 <Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
                 <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
@@ -60,10 +60,6 @@
                                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
                                     <Setter Property="Source" TargetName="toggleIcon" Value="/InvvardDev.EZLayoutDisplay.Desktop;component/Skins/Images/pin.png"/>
                                 </Trigger>
-                                <Trigger Property="IsPressed" Value="true">
-                                    <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
-                                    <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
-                                </Trigger>
                                 <Trigger Property="IsChecked" Value="False">
                                     <Setter Property="Source" TargetName="toggleIcon" Value="/InvvardDev.EZLayoutDisplay.Desktop;component/Skins/Images/pin.png"/>
                                 </Trigger>
@@ -119,7 +115,7 @@
 
         <StackPanel Style="{StaticResource SpControlHintStyle}"
             Visibility="{Binding NoLayoutAvailable, Converter={StaticResource BoolToVisibleConverter}}">
-            <ToggleButton Height="32" VerticalContentAlignment="Center" Content="Pin window" Style="{DynamicResource ToggleButtonStyle1}"/>
+            <ToggleButton Height="32" Content="Pin window" Style="{DynamicResource ToggleButtonPinWindowStyle}"/>
             <TextBlock Text="{Binding ControlHintLabel}" Style="{StaticResource TbControlHintStyle}" />
         </StackPanel>
 

From 1b7466c2ca5f74ff1e70ef6f597c9f2ce9b94834 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Tue, 9 Apr 2019 23:00:02 -0400
Subject: [PATCH 11/29] Move style to dictionary

---
 .../Skins/DisplayLayoutSkin.xaml              | 68 +++++++++++++++++++
 .../View/DisplayLayoutWindow.xaml             | 66 +-----------------
 2 files changed, 69 insertions(+), 65 deletions(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/DisplayLayoutSkin.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/DisplayLayoutSkin.xaml
index cb570f99..1e590fa3 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/DisplayLayoutSkin.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/DisplayLayoutSkin.xaml
@@ -1,6 +1,74 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
+    <Style x:Key="FocusVisual">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Rectangle Margin="2" SnapsToDevicePixels="true" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <SolidColorBrush x:Key="Button.Static.Background" Color="#FFDDDDDD"/>
+    <SolidColorBrush x:Key="Button.Static.Border" Color="#FF707070"/>
+    <SolidColorBrush x:Key="Button.MouseOver.Background" Color="#FFBEE6FD"/>
+    <SolidColorBrush x:Key="Button.MouseOver.Border" Color="#FF3C7FB1"/>
+    <SolidColorBrush x:Key="Button.Pressed.Background" Color="#FFC4E5F6"/>
+    <SolidColorBrush x:Key="Button.Pressed.Border" Color="#FF2C628B"/>
+    <SolidColorBrush x:Key="Button.Disabled.Background" Color="#FFF4F4F4"/>
+    <SolidColorBrush x:Key="Button.Disabled.Border" Color="#FFADB2B5"/>
+    <SolidColorBrush x:Key="Button.Disabled.Foreground" Color="#FF838383"/>
+
+    <Style x:Key="ToggleButtonPinWindowStyle" TargetType="{x:Type ToggleButton}">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
+        <Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Padding" Value="1"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"
+                            SnapsToDevicePixels="true" HorizontalAlignment="Right" Cursor="Hand">
+                        <StackPanel Width="100" VerticalAlignment="Center" Orientation="Horizontal" Margin="5,0">
+                            <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                            <Image x:Name="toggleIcon" Height="{TemplateBinding Height}" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="10,0,0,0"/>
+                        </StackPanel>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="Button.IsDefaulted" Value="true">
+                            <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                            <Setter Property="Source" TargetName="toggleIcon" Value="/InvvardDev.EZLayoutDisplay.Desktop;component/Skins/Images/pin.png"/>
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="False">
+                            <Setter Property="Source" TargetName="toggleIcon" Value="/InvvardDev.EZLayoutDisplay.Desktop;component/Skins/Images/pin.png"/>
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
+                            <Setter Property="Source" TargetName="toggleIcon" Value="/InvvardDev.EZLayoutDisplay.Desktop;component/Skins/Images/pin.remove.png"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
+                            <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
+                            <Setter Property="Source" TargetName="toggleIcon" Value="/InvvardDev.EZLayoutDisplay.Desktop;component/Skins/Images/pin.remove.png"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <Style TargetType="StackPanel" x:Key="SpLayerNameStyle">
         <Setter Property="Width" Value="180" />
         <Setter Property="Margin" Value="0,25,0,0" />
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
index 7969ed5b..9c1aa36b 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
@@ -19,70 +19,6 @@
                 <ResourceDictionary Source="../Skins/KeyboardLayoutSkin.xaml" />
                 <ResourceDictionary Source="../Skins/DisplayLayoutSkin.xaml" />
             </ResourceDictionary.MergedDictionaries>
-            <Style x:Key="FocusVisual">
-                <Setter Property="Control.Template">
-                    <Setter.Value>
-                        <ControlTemplate>
-                            <Rectangle Margin="2" SnapsToDevicePixels="true" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-            <SolidColorBrush x:Key="Button.Static.Background" Color="#FFDDDDDD"/>
-            <SolidColorBrush x:Key="Button.Static.Border" Color="#FF707070"/>
-            <SolidColorBrush x:Key="Button.MouseOver.Background" Color="#FFBEE6FD"/>
-            <SolidColorBrush x:Key="Button.MouseOver.Border" Color="#FF3C7FB1"/>
-            <SolidColorBrush x:Key="Button.Pressed.Background" Color="#FFC4E5F6"/>
-            <SolidColorBrush x:Key="Button.Pressed.Border" Color="#FF2C628B"/>
-            <SolidColorBrush x:Key="Button.Disabled.Background" Color="#FFF4F4F4"/>
-            <SolidColorBrush x:Key="Button.Disabled.Border" Color="#FFADB2B5"/>
-            <SolidColorBrush x:Key="Button.Disabled.Foreground" Color="#FF838383"/>
-            <Style x:Key="ToggleButtonPinWindowStyle" TargetType="{x:Type ToggleButton}">
-                <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-                <Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
-                <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
-                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-                <Setter Property="BorderThickness" Value="1"/>
-                <Setter Property="HorizontalContentAlignment" Value="Center"/>
-                <Setter Property="VerticalContentAlignment" Value="Center"/>
-                <Setter Property="Padding" Value="1"/>
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type ToggleButton}">
-                            <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true" HorizontalAlignment="Right" Cursor="Hand">
-                                <StackPanel Width="100" VerticalAlignment="Center" Orientation="Horizontal" Margin="5,0">
-                                    <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                                    <Image x:Name="toggleIcon" Height="{TemplateBinding Height}" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="10,0,0,0"/>
-                                </StackPanel>
-                            </Border>
-                            <ControlTemplate.Triggers>
-                                <Trigger Property="Button.IsDefaulted" Value="true">
-                                    <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
-                                    <Setter Property="Source" TargetName="toggleIcon" Value="/InvvardDev.EZLayoutDisplay.Desktop;component/Skins/Images/pin.png"/>
-                                </Trigger>
-                                <Trigger Property="IsChecked" Value="False">
-                                    <Setter Property="Source" TargetName="toggleIcon" Value="/InvvardDev.EZLayoutDisplay.Desktop;component/Skins/Images/pin.png"/>
-                                </Trigger>
-                                <Trigger Property="IsChecked" Value="True">
-                                    <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
-                                    <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
-                                    <Setter Property="Source" TargetName="toggleIcon" Value="/InvvardDev.EZLayoutDisplay.Desktop;component/Skins/Images/pin.remove.png"/>
-                                </Trigger>
-                                <Trigger Property="IsMouseOver" Value="true">
-                                    <Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
-                                    <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
-                                </Trigger>
-                                <Trigger Property="IsEnabled" Value="false">
-                                    <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
-                                    <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
-                                    <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
-                                    <Setter Property="Source" TargetName="toggleIcon" Value="/InvvardDev.EZLayoutDisplay.Desktop;component/Skins/Images/pin.remove.png"/>
-                                </Trigger>
-                            </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
         </ResourceDictionary>
     </Window.Resources>
 
@@ -115,7 +51,7 @@
 
         <StackPanel Style="{StaticResource SpControlHintStyle}"
             Visibility="{Binding NoLayoutAvailable, Converter={StaticResource BoolToVisibleConverter}}">
-            <ToggleButton Height="32" Content="Pin window" Style="{DynamicResource ToggleButtonPinWindowStyle}"/>
+            <ToggleButton Height="32" Margin="0 0 0 5" Content="Pin window" Style="{StaticResource ToggleButtonPinWindowStyle}"/>
             <TextBlock Text="{Binding ControlHintLabel}" Style="{StaticResource TbControlHintStyle}" />
         </StackPanel>
 

From 044ce157d3fe7e55d958c9a9a127a6efec9d479a Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Tue, 9 Apr 2019 23:02:38 -0400
Subject: [PATCH 12/29] Move control properties to style

---
 .../Skins/DisplayLayoutSkin.xaml                                | 2 ++
 .../View/DisplayLayoutWindow.xaml                               | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/DisplayLayoutSkin.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/DisplayLayoutSkin.xaml
index 1e590fa3..86eaa5cc 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/DisplayLayoutSkin.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/DisplayLayoutSkin.xaml
@@ -29,6 +29,8 @@
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Padding" Value="1"/>
+        <Setter Property="Height" Value="32"/>
+        <Setter Property="Margin" Value="0 0 0 5"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
index 9c1aa36b..5e3327b6 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
@@ -51,7 +51,7 @@
 
         <StackPanel Style="{StaticResource SpControlHintStyle}"
             Visibility="{Binding NoLayoutAvailable, Converter={StaticResource BoolToVisibleConverter}}">
-            <ToggleButton Height="32" Margin="0 0 0 5" Content="Pin window" Style="{StaticResource ToggleButtonPinWindowStyle}"/>
+            <ToggleButton Content="Pin window" Style="{StaticResource ToggleButtonPinWindowStyle}"/>
             <TextBlock Text="{Binding ControlHintLabel}" Style="{StaticResource TbControlHintStyle}" />
         </StackPanel>
 

From f83b024fea9f878cd5eef51994b8def69be90ee0 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Fri, 12 Apr 2019 12:43:47 -0400
Subject: [PATCH 13/29] Create TogglePinWindow relay command

---
 .../ViewModel/DisplayLayoutViewModel.cs            | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
index 5137fe4b..bb30aa25 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
@@ -29,6 +29,7 @@ public class DisplayLayoutViewModel : ViewModelBase
         private const int ResizableWindowHeight = 453;
 
         #endregion
+
         #region Fields
 
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
@@ -39,6 +40,7 @@ public class DisplayLayoutViewModel : ViewModelBase
 
         private ICommand _lostFocusCommand;
         private ICommand _nextLayerCommand;
+        private ICommand _togglePinWindowCommand;
 
         private List<List<KeyTemplate>> _layoutTemplates;
         private ObservableCollection<KeyTemplate> _currentLayoutTemplate;
@@ -177,6 +179,13 @@ public WindowStyle WindowStyle
             _nextLayerCommand
             ?? (_nextLayerCommand = new RelayCommand(NextLayer, NextLayerCanExecute));
 
+        /// <summary>
+        /// Next layer command.
+        /// </summary>
+        public ICommand TogglePinWindowCommand =>
+            _togglePinWindowCommand
+            ?? (_togglePinWindowCommand = new RelayCommand(TogglePinWindow));
+
         #endregion
 
         public DisplayLayoutViewModel(IWindowService windowService, ILayoutService layoutService, ISettingsService settingsService)
@@ -372,6 +381,11 @@ private bool NextLayerCanExecute()
             return canExecute;
         }
 
+        private void TogglePinWindow()
+        {
+            
+        }
+
         #endregion
 
         #endregion

From 5918ece33f7133441d223ea96ad725f1a1c380f4 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Fri, 12 Apr 2019 12:44:00 -0400
Subject: [PATCH 14/29] Bind TogglePinWindow relay command

---
 .../View/DisplayLayoutWindow.xaml                               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
index 5e3327b6..b0446833 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
@@ -51,7 +51,7 @@
 
         <StackPanel Style="{StaticResource SpControlHintStyle}"
             Visibility="{Binding NoLayoutAvailable, Converter={StaticResource BoolToVisibleConverter}}">
-            <ToggleButton Content="Pin window" Style="{StaticResource ToggleButtonPinWindowStyle}"/>
+            <ToggleButton Content="Pin window" Style="{StaticResource ToggleButtonPinWindowStyle}" Command="{Binding TogglePinWindowCommand}" />
             <TextBlock Text="{Binding ControlHintLabel}" Style="{StaticResource TbControlHintStyle}" />
         </StackPanel>
 

From 05d6f879beb9d2159fc9972e2e297ae432812d63 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Fri, 12 Apr 2019 13:04:21 -0400
Subject: [PATCH 15/29] Create bound property IsWindowPinned

---
 .../ViewModel/DisplayLayoutViewModel.cs             | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
index bb30aa25..886df26f 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
@@ -49,6 +49,7 @@ public class DisplayLayoutViewModel : ViewModelBase
 
         private int _windowHeight;
         private WindowStyle _windowStyle;
+        private bool _isWindowPinned;
 
         private string _windowTitle;
         private string _noLayoutWarningFirstLine;
@@ -161,6 +162,15 @@ public WindowStyle WindowStyle
             private set => Set(ref _windowStyle, value);
         }
 
+        /// <summary>
+        /// Gets or sets the pinned status.
+        /// </summary>
+        public bool IsWindowPinned
+        {
+            get => _isWindowPinned;
+            private set => Set(ref _isWindowPinned, value);
+        }
+
         #endregion
 
         #region Relay commands
@@ -221,6 +231,7 @@ private void SetWindowParameters()
         {
             WindowStyle = WindowStyle.None;
             WindowHeight = NonResizableWindowHeight;
+            IsWindowPinned = false;
         }
 
         private async void LoadCompleteLayout()
@@ -383,7 +394,7 @@ private bool NextLayerCanExecute()
 
         private void TogglePinWindow()
         {
-            
+            IsWindowPinned = !IsWindowPinned;
         }
 
         #endregion

From 312e5d466998d75eff3920bdceaf29765ac881d4 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Fri, 12 Apr 2019 13:04:31 -0400
Subject: [PATCH 16/29] Bind IsWindowPinned

---
 .../View/DisplayLayoutWindow.xaml                               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
index b0446833..7e091210 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
@@ -51,7 +51,7 @@
 
         <StackPanel Style="{StaticResource SpControlHintStyle}"
             Visibility="{Binding NoLayoutAvailable, Converter={StaticResource BoolToVisibleConverter}}">
-            <ToggleButton Content="Pin window" Style="{StaticResource ToggleButtonPinWindowStyle}" Command="{Binding TogglePinWindowCommand}" />
+            <ToggleButton Content="Pin window" IsChecked="{Binding IsWindowPinned}" Style="{StaticResource ToggleButtonPinWindowStyle}" Command="{Binding TogglePinWindowCommand}" />
             <TextBlock Text="{Binding ControlHintLabel}" Style="{StaticResource TbControlHintStyle}" />
         </StackPanel>
 

From 3ea64e860d6743a7b682c2e402091a247faeb2c7 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Fri, 12 Apr 2019 13:10:24 -0400
Subject: [PATCH 17/29] Add ToggelPinWindow tests

---
 .../ViewModel/DisplayLayoutViewModelTest.cs   | 61 +++++++++----------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Tests/ViewModel/DisplayLayoutViewModelTest.cs b/src/InvvardDev.EZLayoutDisplay.Tests/ViewModel/DisplayLayoutViewModelTest.cs
index 96067371..2296b5e8 100644
--- a/src/InvvardDev.EZLayoutDisplay.Tests/ViewModel/DisplayLayoutViewModelTest.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Tests/ViewModel/DisplayLayoutViewModelTest.cs
@@ -18,18 +18,10 @@ public void DisplayLayoutViewModel_Constructor()
             var mockLayoutService = new Mock<ILayoutService>();
             var mockSettingsService = new Mock<ISettingsService>();
             mockSettingsService.SetupProperty(s => s.EZLayout,
-                                              new EZLayout {
-                                                               EZLayers = new List<EZLayer> {
-                                                                                                new EZLayer {
-                                                                                                                EZKeys = new List<EZKey> {
-                                                                                                                                             new EZKey {
-                                                                                                                                                           Label = new KeyLabel("A"),
-                                                                                                                                                           Modifier = new KeyLabel("a")
-                                                                                                                                                       }
-                                                                                                                                         }
-                                                                                                            }
-                                                                                            }
-                                                           });
+                                              new EZLayout
+                                              {
+                                                  EZLayers = new List<EZLayer> { new EZLayer { EZKeys = new List<EZKey> { new EZKey { Label = new KeyLabel("A"), Modifier = new KeyLabel("a") } } } }
+                                              });
 
             //Act
             var displayLayoutViewModel = new DisplayLayoutViewModel(mockWindowService.Object, mockLayoutService.Object, mockSettingsService.Object);
@@ -80,10 +72,7 @@ public void LoadCompleteLayout(int numberOfKey, int numberOfLayer, bool noLayout
 
             for (int i = 0 ; i < numberOfLayer ; i++)
             {
-                keyboardLayout.EZLayers.Add(new EZLayer {
-                                                            Index = i,
-                                                            EZKeys = new List<EZKey>(ezKeys)
-                                                        });
+                keyboardLayout.EZLayers.Add(new EZLayer { Index = i, EZKeys = new List<EZKey>(ezKeys) });
             }
 
             var mockWindowService = new Mock<IWindowService>();
@@ -111,12 +100,7 @@ public void NextLayerCommand_CanExecute(int layerNumber, bool expectedCanExecute
 
             for (int i = 0 ; i < layerNumber ; i++)
             {
-                keyboardLayout.EZLayers.Add(new EZLayer {
-                                                            Index = i,
-                                                            EZKeys = new List<EZKey> {
-                                                                                         new EZKey()
-                                                                                     }
-                                                        });
+                keyboardLayout.EZLayers.Add(new EZLayer { Index = i, EZKeys = new List<EZKey> { new EZKey() } });
             }
 
             var layoutTemplate = new List<KeyTemplate>();
@@ -157,12 +141,7 @@ public void NextLayerCommand_Execute(int layerNumber, int nextLayerHit, int expe
 
             for (int i = 0 ; i < layerNumber ; i++)
             {
-                keyboardLayout.EZLayers.Add(new EZLayer {
-                                                            Index = i,
-                                                            EZKeys = new List<EZKey> {
-                                                                                         new EZKey()
-                                                                                     }
-                                                        });
+                keyboardLayout.EZLayers.Add(new EZLayer { Index = i, EZKeys = new List<EZKey> { new EZKey() } });
             }
 
             var layoutTemplate = new List<KeyTemplate>();
@@ -190,6 +169,28 @@ public void NextLayerCommand_Execute(int layerNumber, int nextLayerHit, int expe
             Assert.Equal(expectedCurrentLayerIndex, displayLayoutViewModel.CurrentLayerIndex);
         }
 
+        [ Theory ]
+        [ InlineData(1, true) ]
+        [ InlineData(2, false) ]
+        public void TogglePinWindow_Execute(int executeNumber, bool expectedPinnedStatus)
+        {
+            //Arrange
+            var mockLayoutService = new Mock<ILayoutService>();
+            var mockWindowService = new Mock<IWindowService>();
+            var mockSettingsService = new Mock<ISettingsService>();
+
+            //Act
+            var displayLayoutViewModel = new DisplayLayoutViewModel(mockWindowService.Object, mockLayoutService.Object, mockSettingsService.Object);
+
+            for (int i = 0 ; i < executeNumber ; i++)
+            {
+                displayLayoutViewModel.TogglePinWindowCommand.Execute(null);
+            }
+
+            //Assert
+            Assert.Equal(expectedPinnedStatus, displayLayoutViewModel.IsWindowPinned);
+        }
+
         [ Fact ]
         public void NoLayoutAvailable()
         {
@@ -198,9 +199,7 @@ public void NoLayoutAvailable()
             var mockWindowService = new Mock<IWindowService>();
             var mockSettingsService = new Mock<ISettingsService>();
             mockSettingsService.SetupProperty(s => s.EZLayout,
-                                              new EZLayout {
-                                                               EZLayers = new List<EZLayer>()
-                                                           });
+                                              new EZLayout { EZLayers = new List<EZLayer>() });
 
             // Act
             var displayLayoutViewModel = new DisplayLayoutViewModel(mockWindowService.Object, mockLayoutService.Object, mockSettingsService.Object);

From 789eb7036d4d58b454efaee85cf8239e2d882cf6 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Fri, 12 Apr 2019 21:06:20 -0400
Subject: [PATCH 18/29] Add the window configuration method

---
 .../ViewModel/DisplayLayoutViewModel.cs       | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
index 886df26f..5b609147 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
@@ -26,7 +26,7 @@ public class DisplayLayoutViewModel : ViewModelBase
         #region Constants
 
         private const int NonResizableWindowHeight = 423;
-        private const int ResizableWindowHeight = 453;
+        private const int ResizableWindowHeight = 424;
 
         #endregion
 
@@ -150,7 +150,11 @@ public int CurrentLayerIndex
         public int WindowHeight
         {
             get => _windowHeight;
-            private set => Set(ref _windowHeight, value);
+            private set
+            {
+                _windowHeight = value;
+                RaisePropertyChanged(() => WindowHeight);
+            }
         }
 
         /// <summary>
@@ -229,9 +233,8 @@ private void SetLabelUi()
 
         private void SetWindowParameters()
         {
-            WindowStyle = WindowStyle.None;
-            WindowHeight = NonResizableWindowHeight;
             IsWindowPinned = false;
+            ConfigureWindow(NonResizableWindowHeight);
         }
 
         private async void LoadCompleteLayout()
@@ -294,7 +297,7 @@ private void LoadDesignTimeModel()
                                                            DisplayType = KeyDisplayType.SimpleLabel,
                                                            KeyCategory = KeyCategory.DualFunction,
                                                            Color = "#BBB"
-            };
+                                                       };
 
             for (int i = 2 ; i < CurrentLayoutTemplate.Count ; i++)
             {
@@ -304,7 +307,7 @@ private void LoadDesignTimeModel()
                                                                KeyCategory = KeyCategory.French,
                                                                InternationalHint = "fr",
                                                                Color = "#777"
-                };
+                                                           };
             }
         }
 
@@ -350,6 +353,11 @@ private void ChangeLayerName()
             CurrentLayerName = $"{_ezLayout.EZLayers[CurrentLayerIndex].Name} {_ezLayout.EZLayers[CurrentLayerIndex].Index}";
         }
 
+        private void ConfigureWindow(int windowHeight)
+        {
+            WindowHeight = windowHeight;
+        }
+
         #region Delegates
 
         private void LoadCompleteLayout(UpdatedLayoutMessage obj)
@@ -395,6 +403,15 @@ private bool NextLayerCanExecute()
         private void TogglePinWindow()
         {
             IsWindowPinned = !IsWindowPinned;
+
+            if (IsWindowPinned)
+            {
+                ConfigureWindow(ResizableWindowHeight);
+            }
+            else
+            {
+                ConfigureWindow(ResizableWindowHeight);
+            }
         }
 
         #endregion

From 62787505a1ef94816446cf1db5986b345e602ec5 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Fri, 12 Apr 2019 21:07:30 -0400
Subject: [PATCH 19/29] Add the grid height and width

---
 .../View/DisplayLayoutWindow.xaml                         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
index 7e091210..37ac713a 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
@@ -4,10 +4,10 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
-    xmlns:command="http://www.galasoft.ch/mvvmlight"
+    xmlns:command="http://www.galasoft.ch/mvvmlight" mc:Ignorable="d"
     x:Class="InvvardDev.EZLayoutDisplay.Desktop.View.DisplayLayoutWindow"
     DataContext="{Binding DisplayLayout, Source={StaticResource Locator}}"
-    mc:Ignorable="d" Height="{Binding WindowHeight}" Width="1075"
+    Height="Auto" Width="Auto" SizeToContent="WidthAndHeight"
     WindowStartupLocation="CenterScreen"
     ResizeMode="NoResize" Visibility="Visible" ShowInTaskbar="True"
     WindowStyle="{Binding WindowStyle}" Background="{StaticResource WindowBackgroundBrush}"
@@ -32,7 +32,7 @@
         <KeyBinding Key="Space" Command="{Binding NextLayerCommand, Mode=OneWay}" />
     </Window.InputBindings>
 
-    <Grid>
+    <Grid Width="1075" Height="{Binding WindowHeight}">
         <ItemsControl ItemsSource="{Binding CurrentLayoutTemplate}"
                       ItemTemplateSelector="{StaticResource KeyContentTemplateSelector}"
                       Visibility="{Binding NoLayoutAvailable, Converter={StaticResource BoolToVisibleConverter}}">
@@ -51,7 +51,7 @@
 
         <StackPanel Style="{StaticResource SpControlHintStyle}"
             Visibility="{Binding NoLayoutAvailable, Converter={StaticResource BoolToVisibleConverter}}">
-            <ToggleButton Content="Pin window" IsChecked="{Binding IsWindowPinned}" Style="{StaticResource ToggleButtonPinWindowStyle}" Command="{Binding TogglePinWindowCommand}" />
+            <ToggleButton Content="Pin window" IsChecked="{Binding IsWindowPinned, Mode=OneWay}" Style="{StaticResource ToggleButtonPinWindowStyle}" Command="{Binding TogglePinWindowCommand}" />
             <TextBlock Text="{Binding ControlHintLabel}" Style="{StaticResource TbControlHintStyle}" />
         </StackPanel>
 

From df4038ce56aad83ebe15fb21d5b80cb31f26b2d1 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Fri, 12 Apr 2019 21:09:56 -0400
Subject: [PATCH 20/29] Change window style to a Single Border one

---
 .../View/DisplayLayoutWindow.xaml                               | 2 +-
 .../ViewModel/DisplayLayoutViewModel.cs                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
index 37ac713a..3a856e6b 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
@@ -10,7 +10,7 @@
     Height="Auto" Width="Auto" SizeToContent="WidthAndHeight"
     WindowStartupLocation="CenterScreen"
     ResizeMode="NoResize" Visibility="Visible" ShowInTaskbar="True"
-    WindowStyle="{Binding WindowStyle}" Background="{StaticResource WindowBackgroundBrush}"
+    WindowStyle="SingleBorderWindow" Background="{StaticResource WindowBackgroundBrush}"
     Title="{Binding WindowTitle}" Icon="{StaticResource WindowIcon}">
 
     <Window.Resources>
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
index 5b609147..05d3ff45 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
@@ -26,7 +26,7 @@ public class DisplayLayoutViewModel : ViewModelBase
         #region Constants
 
         private const int NonResizableWindowHeight = 423;
-        private const int ResizableWindowHeight = 424;
+        private const int ResizableWindowHeight = 423;
 
         #endregion
 

From 3a84bf52a61b6e8f5c5015e7cf8f16f031c9149d Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Fri, 12 Apr 2019 23:19:30 -0400
Subject: [PATCH 21/29] Bind window top most status to toggle button

---
 .../View/DisplayLayoutWindow.xaml                           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
index 3a856e6b..63b2815a 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
@@ -8,7 +8,7 @@
     x:Class="InvvardDev.EZLayoutDisplay.Desktop.View.DisplayLayoutWindow"
     DataContext="{Binding DisplayLayout, Source={StaticResource Locator}}"
     Height="Auto" Width="Auto" SizeToContent="WidthAndHeight"
-    WindowStartupLocation="CenterScreen"
+    WindowStartupLocation="CenterScreen" Topmost="{Binding ElementName=ToggleWindowPin, Path=IsChecked}"
     ResizeMode="NoResize" Visibility="Visible" ShowInTaskbar="True"
     WindowStyle="SingleBorderWindow" Background="{StaticResource WindowBackgroundBrush}"
     Title="{Binding WindowTitle}" Icon="{StaticResource WindowIcon}">
@@ -32,7 +32,7 @@
         <KeyBinding Key="Space" Command="{Binding NextLayerCommand, Mode=OneWay}" />
     </Window.InputBindings>
 
-    <Grid Width="1075" Height="{Binding WindowHeight}">
+    <Grid Width="1075" Height="423">
         <ItemsControl ItemsSource="{Binding CurrentLayoutTemplate}"
                       ItemTemplateSelector="{StaticResource KeyContentTemplateSelector}"
                       Visibility="{Binding NoLayoutAvailable, Converter={StaticResource BoolToVisibleConverter}}">
@@ -51,7 +51,7 @@
 
         <StackPanel Style="{StaticResource SpControlHintStyle}"
             Visibility="{Binding NoLayoutAvailable, Converter={StaticResource BoolToVisibleConverter}}">
-            <ToggleButton Content="Pin window" IsChecked="{Binding IsWindowPinned, Mode=OneWay}" Style="{StaticResource ToggleButtonPinWindowStyle}" Command="{Binding TogglePinWindowCommand}" />
+            <ToggleButton x:Name="ToggleWindowPin" Content="Pin window" IsChecked="{Binding IsWindowPinned, Mode=OneWay}" Style="{StaticResource ToggleButtonPinWindowStyle}" Command="{Binding TogglePinWindowCommand}" />
             <TextBlock Text="{Binding ControlHintLabel}" Style="{StaticResource TbControlHintStyle}" />
         </StackPanel>
 

From c58f0d9058b770d5b0ae15561c6299cc550315af Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Fri, 12 Apr 2019 23:29:03 -0400
Subject: [PATCH 22/29] Change the way toggle value is passed over VM

---
 .../View/DisplayLayoutWindow.xaml                               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
index 63b2815a..0a5dc1bf 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
@@ -51,7 +51,7 @@
 
         <StackPanel Style="{StaticResource SpControlHintStyle}"
             Visibility="{Binding NoLayoutAvailable, Converter={StaticResource BoolToVisibleConverter}}">
-            <ToggleButton x:Name="ToggleWindowPin" Content="Pin window" IsChecked="{Binding IsWindowPinned, Mode=OneWay}" Style="{StaticResource ToggleButtonPinWindowStyle}" Command="{Binding TogglePinWindowCommand}" />
+            <ToggleButton x:Name="ToggleWindowPin" Content="Pin window" IsChecked="{Binding IsWindowPinned}" Style="{StaticResource ToggleButtonPinWindowStyle}" Command="{Binding TogglePinWindowCommand}" />
             <TextBlock Text="{Binding ControlHintLabel}" Style="{StaticResource TbControlHintStyle}" />
         </StackPanel>
 

From b0bf15f805f2b2b27b519b47cf5e0bc8db3bfd14 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Fri, 12 Apr 2019 23:29:51 -0400
Subject: [PATCH 23/29] Simplify window pinning

---
 .../ViewModel/DisplayLayoutViewModel.cs       | 60 ++++---------------
 1 file changed, 10 insertions(+), 50 deletions(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
index 05d3ff45..a00a9289 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows;
 using System.Windows.Input;
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.CommandWpf;
@@ -23,13 +22,6 @@ namespace InvvardDev.EZLayoutDisplay.Desktop.ViewModel
 {
     public class DisplayLayoutViewModel : ViewModelBase
     {
-        #region Constants
-
-        private const int NonResizableWindowHeight = 423;
-        private const int ResizableWindowHeight = 423;
-
-        #endregion
-
         #region Fields
 
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
@@ -47,8 +39,6 @@ public class DisplayLayoutViewModel : ViewModelBase
         private int _currentLayerIndex;
         private EZLayout _ezLayout;
 
-        private int _windowHeight;
-        private WindowStyle _windowStyle;
         private bool _isWindowPinned;
 
         private string _windowTitle;
@@ -144,35 +134,13 @@ public int CurrentLayerIndex
             private set => Set(ref _currentLayerIndex, value);
         }
 
-        /// <summary>
-        /// Gets or sets the window's height.
-        /// </summary>
-        public int WindowHeight
-        {
-            get => _windowHeight;
-            private set
-            {
-                _windowHeight = value;
-                RaisePropertyChanged(() => WindowHeight);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the window' style.
-        /// </summary>
-        public WindowStyle WindowStyle
-        {
-            get => _windowStyle;
-            private set => Set(ref _windowStyle, value);
-        }
-
         /// <summary>
         /// Gets or sets the pinned status.
         /// </summary>
         public bool IsWindowPinned
         {
             get => _isWindowPinned;
-            private set => Set(ref _isWindowPinned, value);
+            set => Set(ref _isWindowPinned, value);
         }
 
         #endregion
@@ -184,7 +152,7 @@ public bool IsWindowPinned
         /// </summary>
         public ICommand LostFocusCommand =>
             _lostFocusCommand
-            ?? (_lostFocusCommand = new RelayCommand(LostFocus));
+            ?? (_lostFocusCommand = new RelayCommand(LostFocus, LostFocusCanExecute));
 
         /// <summary>
         /// Next layer command.
@@ -234,7 +202,6 @@ private void SetLabelUi()
         private void SetWindowParameters()
         {
             IsWindowPinned = false;
-            ConfigureWindow(NonResizableWindowHeight);
         }
 
         private async void LoadCompleteLayout()
@@ -353,11 +320,6 @@ private void ChangeLayerName()
             CurrentLayerName = $"{_ezLayout.EZLayers[CurrentLayerIndex].Name} {_ezLayout.EZLayers[CurrentLayerIndex].Index}";
         }
 
-        private void ConfigureWindow(int windowHeight)
-        {
-            WindowHeight = windowHeight;
-        }
-
         #region Delegates
 
         private void LoadCompleteLayout(UpdatedLayoutMessage obj)
@@ -400,18 +362,16 @@ private bool NextLayerCanExecute()
             return canExecute;
         }
 
-        private void TogglePinWindow()
+        private bool LostFocusCanExecute()
         {
-            IsWindowPinned = !IsWindowPinned;
+            var canExecute = !IsWindowPinned;
 
-            if (IsWindowPinned)
-            {
-                ConfigureWindow(ResizableWindowHeight);
-            }
-            else
-            {
-                ConfigureWindow(ResizableWindowHeight);
-            }
+            return canExecute;
+        }
+
+        private void TogglePinWindow()
+        {
+            
         }
 
         #endregion

From 22d4e2430198a4d76630d3a63169e32d719e5cf8 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Fri, 12 Apr 2019 23:35:24 -0400
Subject: [PATCH 24/29] Remove focusable from active controls

---
 .../View/DisplayLayoutWindow.xaml                             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
index 0a5dc1bf..46785b0e 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
@@ -33,7 +33,7 @@
     </Window.InputBindings>
 
     <Grid Width="1075" Height="423">
-        <ItemsControl ItemsSource="{Binding CurrentLayoutTemplate}"
+        <ItemsControl ItemsSource="{Binding CurrentLayoutTemplate}" Focusable="False"
                       ItemTemplateSelector="{StaticResource KeyContentTemplateSelector}"
                       Visibility="{Binding NoLayoutAvailable, Converter={StaticResource BoolToVisibleConverter}}">
             <ItemsControl.ItemsPanel>
@@ -51,7 +51,7 @@
 
         <StackPanel Style="{StaticResource SpControlHintStyle}"
             Visibility="{Binding NoLayoutAvailable, Converter={StaticResource BoolToVisibleConverter}}">
-            <ToggleButton x:Name="ToggleWindowPin" Content="Pin window" IsChecked="{Binding IsWindowPinned}" Style="{StaticResource ToggleButtonPinWindowStyle}" Command="{Binding TogglePinWindowCommand}" />
+            <ToggleButton Focusable="False" x:Name="ToggleWindowPin" Content="Pin window" IsChecked="{Binding IsWindowPinned}" Style="{StaticResource ToggleButtonPinWindowStyle}" Command="{Binding TogglePinWindowCommand}" />
             <TextBlock Text="{Binding ControlHintLabel}" Style="{StaticResource TbControlHintStyle}" />
         </StackPanel>
 

From f0daa1472e9840d9a446337cf9db9c7810b2e5b5 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Fri, 12 Apr 2019 23:40:29 -0400
Subject: [PATCH 25/29] Split Escape and Lost focus commands

---
 .../View/DisplayLayoutWindow.xaml                         | 5 +++--
 .../ViewModel/DisplayLayoutViewModel.cs                   | 8 ++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
index 46785b0e..2b776d82 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
@@ -28,7 +28,7 @@
         </i:EventTrigger>
     </i:Interaction.Triggers>
     <Window.InputBindings>
-        <KeyBinding Key="Escape" Command="{Binding LostFocusCommand, Mode=OneWay}" />
+        <KeyBinding Key="Escape" Command="{Binding HideWindowCommand, Mode=OneWay}" />
         <KeyBinding Key="Space" Command="{Binding NextLayerCommand, Mode=OneWay}" />
     </Window.InputBindings>
 
@@ -51,7 +51,8 @@
 
         <StackPanel Style="{StaticResource SpControlHintStyle}"
             Visibility="{Binding NoLayoutAvailable, Converter={StaticResource BoolToVisibleConverter}}">
-            <ToggleButton Focusable="False" x:Name="ToggleWindowPin" Content="Pin window" IsChecked="{Binding IsWindowPinned}" Style="{StaticResource ToggleButtonPinWindowStyle}" Command="{Binding TogglePinWindowCommand}" />
+            <ToggleButton x:Name="ToggleWindowPin" Content="_Pin window" Command="{Binding TogglePinWindowCommand}"
+                          Focusable="False" IsChecked="{Binding IsWindowPinned}" Style="{StaticResource ToggleButtonPinWindowStyle}" />
             <TextBlock Text="{Binding ControlHintLabel}" Style="{StaticResource TbControlHintStyle}" />
         </StackPanel>
 
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
index a00a9289..0e461c09 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
@@ -31,6 +31,7 @@ public class DisplayLayoutViewModel : ViewModelBase
         private readonly ISettingsService _settingsService;
 
         private ICommand _lostFocusCommand;
+        private ICommand _hideWindowCommand;
         private ICommand _nextLayerCommand;
         private ICommand _togglePinWindowCommand;
 
@@ -154,6 +155,13 @@ public bool IsWindowPinned
             _lostFocusCommand
             ?? (_lostFocusCommand = new RelayCommand(LostFocus, LostFocusCanExecute));
 
+        /// <summary>
+        /// Hide window command.
+        /// </summary>
+        public ICommand HideWindowCommand =>
+            _hideWindowCommand
+            ?? (_hideWindowCommand = new RelayCommand(LostFocus));
+
         /// <summary>
         /// Next layer command.
         /// </summary>

From 1ff68afb69a32412336725956f925461584ecb01 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Fri, 12 Apr 2019 23:46:29 -0400
Subject: [PATCH 26/29] Add control hint for the Escape key

---
 .../View/DisplayLayoutWindow.xaml             |  3 ++-
 .../ViewModel/DisplayLayoutViewModel.cs       | 23 ++++++++++++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
index 2b776d82..302bebe7 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
@@ -53,7 +53,8 @@
             Visibility="{Binding NoLayoutAvailable, Converter={StaticResource BoolToVisibleConverter}}">
             <ToggleButton x:Name="ToggleWindowPin" Content="_Pin window" Command="{Binding TogglePinWindowCommand}"
                           Focusable="False" IsChecked="{Binding IsWindowPinned}" Style="{StaticResource ToggleButtonPinWindowStyle}" />
-            <TextBlock Text="{Binding ControlHintLabel}" Style="{StaticResource TbControlHintStyle}" />
+            <TextBlock Text="{Binding ControlHintEscapeLabel}" Style="{StaticResource TbControlHintStyle}" />
+            <TextBlock Text="{Binding ControlHintSpaceLabel}" Style="{StaticResource TbControlHintStyle}" /> 
         </StackPanel>
 
         <Grid Visibility="{Binding NoLayoutAvailable, Converter={StaticResource BoolToHiddenConverter}}" Width="350">
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
index 0e461c09..81ea253d 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
@@ -47,7 +47,8 @@ public class DisplayLayoutViewModel : ViewModelBase
         private string _noLayoutWarningSecondLine;
         private string _currentLayerNameTitle;
         private string _currentLayerName;
-        private string _controlHintLabel;
+        private string _controlHintSpaceLabel;
+        private string _controlHintEscapeLabel;
         private bool _noLayoutAvailable;
 
         #endregion
@@ -100,12 +101,21 @@ public string CurrentLayerName
         }
 
         /// <summary>
-        /// Gets or sets the control hint label.
+        /// Gets or sets the control hint label for the Space bar.
         /// </summary>
-        public string ControlHintLabel
+        public string ControlHintSpaceLabel
         {
-            get => _controlHintLabel;
-            private set => Set(ref _controlHintLabel, value);
+            get => _controlHintSpaceLabel;
+            private set => Set(ref _controlHintSpaceLabel, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the control hint label for the Space bar.
+        /// </summary>
+        public string ControlHintEscapeLabel
+        {
+            get => _controlHintEscapeLabel;
+            private set => Set(ref _controlHintEscapeLabel, value);
         }
 
         /// <summary>
@@ -204,7 +214,8 @@ private void SetLabelUi()
             NoLayoutWarningSecondLine = "Please, go to the settings and update the layout.";
             CurrentLayerNameTitle = "Current layer :";
             CurrentLayerName = "";
-            ControlHintLabel = "Press 'Space' to display next layer";
+            ControlHintSpaceLabel = "Press 'Space' to display next layer";
+            ControlHintEscapeLabel = "Press 'Escape' to hide window";
         }
 
         private void SetWindowParameters()

From 599f6650c8e24e348eafb0592cac797ada7da69a Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Fri, 12 Apr 2019 23:58:02 -0400
Subject: [PATCH 27/29] Remove Pin window command and...

Bind toggle button labels to VM
---
 .../View/DisplayLayoutWindow.xaml             |  4 +--
 .../ViewModel/DisplayLayoutViewModel.cs       | 35 ++++++++++++-------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
index 302bebe7..50d9f749 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
@@ -51,8 +51,8 @@
 
         <StackPanel Style="{StaticResource SpControlHintStyle}"
             Visibility="{Binding NoLayoutAvailable, Converter={StaticResource BoolToVisibleConverter}}">
-            <ToggleButton x:Name="ToggleWindowPin" Content="_Pin window" Command="{Binding TogglePinWindowCommand}"
-                          Focusable="False" IsChecked="{Binding IsWindowPinned}" Style="{StaticResource ToggleButtonPinWindowStyle}" />
+            <ToggleButton x:Name="ToggleWindowPin" Content="{Binding ToggleBtnPinWindowContent}" ToolTip="{Binding ToggleBtnPinWindowTooltip}"
+                          IsChecked="{Binding IsWindowPinned}" Focusable="False" Style="{StaticResource ToggleButtonPinWindowStyle}" />
             <TextBlock Text="{Binding ControlHintEscapeLabel}" Style="{StaticResource TbControlHintStyle}" />
             <TextBlock Text="{Binding ControlHintSpaceLabel}" Style="{StaticResource TbControlHintStyle}" /> 
         </StackPanel>
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
index 81ea253d..849aa3d9 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
@@ -33,7 +33,6 @@ public class DisplayLayoutViewModel : ViewModelBase
         private ICommand _lostFocusCommand;
         private ICommand _hideWindowCommand;
         private ICommand _nextLayerCommand;
-        private ICommand _togglePinWindowCommand;
 
         private List<List<KeyTemplate>> _layoutTemplates;
         private ObservableCollection<KeyTemplate> _currentLayoutTemplate;
@@ -49,6 +48,8 @@ public class DisplayLayoutViewModel : ViewModelBase
         private string _currentLayerName;
         private string _controlHintSpaceLabel;
         private string _controlHintEscapeLabel;
+        private string _toggleBtnPinWindowContent;
+        private string _toggleBtnPinWindowTooltip;
         private bool _noLayoutAvailable;
 
         #endregion
@@ -118,6 +119,24 @@ public string ControlHintEscapeLabel
             private set => Set(ref _controlHintEscapeLabel, value);
         }
 
+        /// <summary>
+        /// Gets or sets the Pin window toggle button label.
+        /// </summary>
+        public string ToggleBtnPinWindowContent
+        {
+            get => _toggleBtnPinWindowContent;
+            private set => Set(ref _toggleBtnPinWindowContent, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the Pin window toggle button label.
+        /// </summary>
+        public string ToggleBtnPinWindowTooltip
+        {
+            get => _toggleBtnPinWindowTooltip;
+            private set => Set(ref _toggleBtnPinWindowTooltip, value);
+        }
+
         /// <summary>
         /// Gets or sets the no layout available indicator.
         /// </summary>
@@ -179,13 +198,6 @@ public bool IsWindowPinned
             _nextLayerCommand
             ?? (_nextLayerCommand = new RelayCommand(NextLayer, NextLayerCanExecute));
 
-        /// <summary>
-        /// Next layer command.
-        /// </summary>
-        public ICommand TogglePinWindowCommand =>
-            _togglePinWindowCommand
-            ?? (_togglePinWindowCommand = new RelayCommand(TogglePinWindow));
-
         #endregion
 
         public DisplayLayoutViewModel(IWindowService windowService, ILayoutService layoutService, ISettingsService settingsService)
@@ -216,6 +228,8 @@ private void SetLabelUi()
             CurrentLayerName = "";
             ControlHintSpaceLabel = "Press 'Space' to display next layer";
             ControlHintEscapeLabel = "Press 'Escape' to hide window";
+            ToggleBtnPinWindowContent = "_Pin window";
+            ToggleBtnPinWindowTooltip = "Press 'P' to toggle";
         }
 
         private void SetWindowParameters()
@@ -388,11 +402,6 @@ private bool LostFocusCanExecute()
             return canExecute;
         }
 
-        private void TogglePinWindow()
-        {
-            
-        }
-
         #endregion
 
         #endregion

From 3893dae407658b13dad35073c1581b3c977421a5 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Sat, 13 Apr 2019 00:02:22 -0400
Subject: [PATCH 28/29] Fix broken unit tests

---
 .../ViewModel/DisplayLayoutViewModelTest.cs   | 27 +++----------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Tests/ViewModel/DisplayLayoutViewModelTest.cs b/src/InvvardDev.EZLayoutDisplay.Tests/ViewModel/DisplayLayoutViewModelTest.cs
index 2296b5e8..66ac8f4a 100644
--- a/src/InvvardDev.EZLayoutDisplay.Tests/ViewModel/DisplayLayoutViewModelTest.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Tests/ViewModel/DisplayLayoutViewModelTest.cs
@@ -32,7 +32,10 @@ public void DisplayLayoutViewModel_Constructor()
             Assert.Equal("Please, go to the settings and update the layout.", displayLayoutViewModel.NoLayoutWarningSecondLine);
             Assert.Equal("Current layer :", displayLayoutViewModel.CurrentLayerNameTitle);
             Assert.Equal("", displayLayoutViewModel.CurrentLayerName);
-            Assert.Equal("Press 'Space' to display next layer", displayLayoutViewModel.ControlHintLabel);
+            Assert.Equal("Press 'Space' to display next layer", displayLayoutViewModel.ControlHintSpaceLabel);
+            Assert.Equal("Press 'Escape' to hide window", displayLayoutViewModel.ControlHintEscapeLabel);
+            Assert.Equal("_Pin window", displayLayoutViewModel.ToggleBtnPinWindowContent);
+            Assert.Equal("Press 'P' to toggle", displayLayoutViewModel.ToggleBtnPinWindowTooltip);
         }
 
         [ Fact ]
@@ -169,28 +172,6 @@ public void NextLayerCommand_Execute(int layerNumber, int nextLayerHit, int expe
             Assert.Equal(expectedCurrentLayerIndex, displayLayoutViewModel.CurrentLayerIndex);
         }
 
-        [ Theory ]
-        [ InlineData(1, true) ]
-        [ InlineData(2, false) ]
-        public void TogglePinWindow_Execute(int executeNumber, bool expectedPinnedStatus)
-        {
-            //Arrange
-            var mockLayoutService = new Mock<ILayoutService>();
-            var mockWindowService = new Mock<IWindowService>();
-            var mockSettingsService = new Mock<ISettingsService>();
-
-            //Act
-            var displayLayoutViewModel = new DisplayLayoutViewModel(mockWindowService.Object, mockLayoutService.Object, mockSettingsService.Object);
-
-            for (int i = 0 ; i < executeNumber ; i++)
-            {
-                displayLayoutViewModel.TogglePinWindowCommand.Execute(null);
-            }
-
-            //Assert
-            Assert.Equal(expectedPinnedStatus, displayLayoutViewModel.IsWindowPinned);
-        }
-
         [ Fact ]
         public void NoLayoutAvailable()
         {

From eb6e2e8ab46b15917b040dcc11bf83763733ee47 Mon Sep 17 00:00:00 2001
From: Invvard <7305493+Invvard@users.noreply.github.com>
Date: Sat, 13 Apr 2019 00:13:00 -0400
Subject: [PATCH 29/29] Unit test new code

---
 .../ViewModel/DisplayLayoutViewModelTest.cs   | 46 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/InvvardDev.EZLayoutDisplay.Tests/ViewModel/DisplayLayoutViewModelTest.cs b/src/InvvardDev.EZLayoutDisplay.Tests/ViewModel/DisplayLayoutViewModelTest.cs
index 66ac8f4a..fc71f87e 100644
--- a/src/InvvardDev.EZLayoutDisplay.Tests/ViewModel/DisplayLayoutViewModelTest.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Tests/ViewModel/DisplayLayoutViewModelTest.cs
@@ -39,7 +39,7 @@ public void DisplayLayoutViewModel_Constructor()
         }
 
         [ Fact ]
-        public void LostFocusCommandExecute()
+        public void LostFocusCommand_Execute()
         {
             //Arrange
             var mockWindowService = new Mock<IWindowService>();
@@ -56,6 +56,50 @@ public void LostFocusCommandExecute()
         }
 
         [ Theory ]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void LostFocusCommand_CanExecute(bool isPinned)
+        {
+            //Arrange
+            var mockWindowService = new Mock<IWindowService>();
+            mockWindowService.Setup(w => w.CloseWindow<DisplayLayoutWindow>()).Verifiable();
+            var mockLayoutService = new Mock<ILayoutService>();
+            var mockSettingsService = new Mock<ISettingsService>();
+
+            //Act
+            var displayLayoutViewModel = new DisplayLayoutViewModel(mockWindowService.Object, mockLayoutService.Object, mockSettingsService.Object);
+            displayLayoutViewModel.IsWindowPinned = isPinned;
+            displayLayoutViewModel.LostFocusCommand.Execute(null);
+
+            //Assert
+            if (isPinned)
+            {
+                mockWindowService.Verify(w => w.CloseWindow<DisplayLayoutWindow>(), Times.Never);
+            }
+            else
+            {
+                mockWindowService.Verify(w => w.CloseWindow<DisplayLayoutWindow>(), Times.Once);
+            }
+        }
+
+        [Fact]
+        public void HideWindowCommand_Execute()
+        {
+            //Arrange
+            var mockLayoutService = new Mock<ILayoutService>();
+            var mockWindowService = new Mock<IWindowService>();
+            mockWindowService.Setup(w => w.CloseWindow<DisplayLayoutWindow>()).Verifiable();
+            var mockSettingsService = new Mock<ISettingsService>();
+
+            //Act
+            var displayLayoutViewModel = new DisplayLayoutViewModel(mockWindowService.Object, mockLayoutService.Object, mockSettingsService.Object);
+            displayLayoutViewModel.HideWindowCommand.Execute(null);
+
+            //Assert
+            mockWindowService.Verify(w => w.CloseWindow<DisplayLayoutWindow>(), Times.Once);
+        }
+
+        [Theory ]
         [ InlineData(0, 1, true) ]
         [ InlineData(1, 2, false) ]
         [ InlineData(76, 2, false) ]