From dfcf994a02951118ab28e57eb60877fa687d3712 Mon Sep 17 00:00:00 2001
From: NicolD <nicola.delfino@outlook.com>
Date: Sat, 22 Jan 2022 08:26:36 +0100
Subject: [PATCH 1/2] Implemented SidebarBorderWidth

---
 LibreHardwareMonitor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LibreHardwareMonitor b/LibreHardwareMonitor
index 124fabb..65664fd 160000
--- a/LibreHardwareMonitor
+++ b/LibreHardwareMonitor
@@ -1 +1 @@
-Subproject commit 124fabb1951aebe59708b7f8050038b076ac79dd
+Subproject commit 65664fd75ec6dff9c6ccecadfbc45398dff21477

From c0214887a5b7c5ed5123571f21bb56f10167f9f6 Mon Sep 17 00:00:00 2001
From: NicolD <nicola.delfino@outlook.com>
Date: Sat, 22 Jan 2022 08:27:01 +0100
Subject: [PATCH 2/2] Implemented SidebarBorderWidth

---
 .../Properties/Resources.Designer.cs          | 20 ++++++++++++-
 SidebarDiagnostics/Properties/Resources.resx  | 11 +++++++-
 SidebarDiagnostics/Settings.cs                | 17 +++++++++++
 SidebarDiagnostics/Settings.xaml              |  7 +++++
 SidebarDiagnostics/SettingsModel.cs           | 18 ++++++++++++
 SidebarDiagnostics/Sidebar.xaml               |  8 +++---
 SidebarDiagnostics/SidebarDiagnostics.csproj  | 28 +++++++++----------
 SidebarDiagnostics/packages.config            |  4 +--
 8 files changed, 90 insertions(+), 23 deletions(-)

diff --git a/SidebarDiagnostics/Properties/Resources.Designer.cs b/SidebarDiagnostics/Properties/Resources.Designer.cs
index e191c1f..5431e99 100644
--- a/SidebarDiagnostics/Properties/Resources.Designer.cs
+++ b/SidebarDiagnostics/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace SidebarDiagnostics.Framework {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class Resources {
@@ -1779,6 +1779,24 @@ public static string SettingsShowTrayIconTooltip {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Sidebar Border Width.
+        /// </summary>
+        public static string SettingsSidebarBorderWidth {
+            get {
+                return ResourceManager.GetString("SettingsSidebarBorderWidth", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Width of the sidebar border in pixels..
+        /// </summary>
+        public static string SettingsSidebarBorderWidthTooltip {
+            get {
+                return ResourceManager.GetString("SettingsSidebarBorderWidthTooltip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Sidebar Width.
         /// </summary>
diff --git a/SidebarDiagnostics/Properties/Resources.resx b/SidebarDiagnostics/Properties/Resources.resx
index 4e24bea..7412aea 100644
--- a/SidebarDiagnostics/Properties/Resources.resx
+++ b/SidebarDiagnostics/Properties/Resources.resx
@@ -9,6 +9,7 @@
     that is mostly human readable. The generation and parsing of the 
     various data types are done through the TypeConverter classes 
     associated with the data types.
+    
     Example:
     
     ... ado.net/XML headers & schema ...
@@ -1040,4 +1041,12 @@
     <value>Shows the name of the computer.</value>
     <comment>Settings show machine name tooltip</comment>
   </data>
-</root>
+  <data name="SettingsSidebarBorderWidth" xml:space="preserve">
+    <value>Sidebar Border Width</value>
+    <comment>Settings sidebar border width label</comment>
+  </data>
+  <data name="SettingsSidebarBorderWidthTooltip" xml:space="preserve">
+    <value>Width of the sidebar border in pixels.</value>
+    <comment>Settings sidebar border width tooltip</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/SidebarDiagnostics/Settings.cs b/SidebarDiagnostics/Settings.cs
index 6c8653a..fc1b735 100644
--- a/SidebarDiagnostics/Settings.cs
+++ b/SidebarDiagnostics/Settings.cs
@@ -380,6 +380,23 @@ public int SidebarWidth
             }
         }
 
+        private int _sidebarBorderWidth { get; set; } = 12;
+
+        [JsonProperty]
+        public int SidebarBorderWidth
+        {
+            get
+            {
+                return _sidebarBorderWidth;
+            }
+            set
+            {
+                _sidebarBorderWidth = value;
+
+                NotifyPropertyChanged("SidebarBorderWidth");
+            }
+        }
+
         private bool _autoBGColor { get; set; } = false;
 
         [JsonProperty]
diff --git a/SidebarDiagnostics/Settings.xaml b/SidebarDiagnostics/Settings.xaml
index 9a360e1..1f0e693 100644
--- a/SidebarDiagnostics/Settings.xaml
+++ b/SidebarDiagnostics/Settings.xaml
@@ -161,6 +161,7 @@
                         <RowDefinition Height="Auto"></RowDefinition>
                         <RowDefinition Height="Auto"></RowDefinition>
                         <RowDefinition Height="38px"></RowDefinition>
+                        <RowDefinition Height="38px"></RowDefinition>
                     </Grid.RowDefinitions>
 
                     <Label Grid.Column="0" Grid.Row="0" Content="{x:Static frame:Resources.SettingsSidebarWidth}" />
@@ -207,6 +208,12 @@
 
                     <Label Grid.Column="0" Grid.Row="12" Content="{x:Static frame:Resources.SettingsDateFormat}" />
                     <ComboBox Grid.Column="1" Grid.Row="12" ItemsSource="{Binding Path=DateSettingItems}" DisplayMemberPath="Display" SelectedValue="{Binding Path=DateSetting, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding Path=ShowClock, Mode=OneWay}" ToolTip="{x:Static frame:Resources.SettingsDateFormatTooltip}" />
+
+                    <Label Grid.Column="0" Grid.Row="13" Content="{x:Static frame:Resources.SettingsSidebarBorderWidth}" />
+                    <DockPanel Grid.Column="1" Grid.Row="13">
+                        <TextBox Text="{Binding ElementName=SidebarBorderWidthSlider, Path=Value, UpdateSourceTrigger=PropertyChanged}" PreviewTextInput="NumberBox_PreviewTextInput" />
+                        <Slider x:Name="SidebarBorderWidthSlider" Value="{Binding Path=SidebarBorderWidth, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Minimum="0" Maximum="20" TickFrequency="1" LargeChange="2" ToolTip="{x:Static frame:Resources.SettingsSidebarBorderWidthTooltip}" />
+                    </DockPanel>
                 </Grid>
             </TabItem>
             <TabItem Header="{x:Static frame:Resources.SettingsMonitorsTab}">
diff --git a/SidebarDiagnostics/SettingsModel.cs b/SidebarDiagnostics/SettingsModel.cs
index 92610b1..4673299 100644
--- a/SidebarDiagnostics/SettingsModel.cs
+++ b/SidebarDiagnostics/SettingsModel.cs
@@ -52,6 +52,7 @@ public SettingsModel(Sidebar sidebar)
             AutoUpdate = Framework.Settings.Instance.AutoUpdate;
             RunAtStartup = Framework.Settings.Instance.RunAtStartup;
             SidebarWidth = Framework.Settings.Instance.SidebarWidth;
+            SidebarBorderWidth = Framework.Settings.Instance.SidebarBorderWidth;
             AutoBGColor = Framework.Settings.Instance.AutoBGColor;
             BGColor = Framework.Settings.Instance.BGColor;
             BGOpacity = Framework.Settings.Instance.BGOpacity;
@@ -148,6 +149,7 @@ public void Save()
             Framework.Settings.Instance.AutoUpdate = AutoUpdate;
             Framework.Settings.Instance.RunAtStartup = RunAtStartup;
             Framework.Settings.Instance.SidebarWidth = SidebarWidth;
+            Framework.Settings.Instance.SidebarBorderWidth = SidebarBorderWidth;
             Framework.Settings.Instance.AutoBGColor = AutoBGColor;
             Framework.Settings.Instance.BGColor = BGColor;
             Framework.Settings.Instance.BGOpacity = BGOpacity;
@@ -576,6 +578,22 @@ public int SidebarWidth
             }
         }
 
+        private int _sidebarBorderWidth { get; set; }
+
+        public int SidebarBorderWidth
+        {
+            get
+            {
+                return _sidebarBorderWidth;
+            }
+            set
+            {
+                _sidebarBorderWidth = value;
+
+                NotifyPropertyChanged("SidebarBorderWidth");
+            }
+        }
+
         private bool _autoBGColor { get; set; }
 
         public bool AutoBGColor
diff --git a/SidebarDiagnostics/Sidebar.xaml b/SidebarDiagnostics/Sidebar.xaml
index bfe256e..3296be3 100644
--- a/SidebarDiagnostics/Sidebar.xaml
+++ b/SidebarDiagnostics/Sidebar.xaml
@@ -49,8 +49,8 @@
             </Ellipse.Style>
         </Ellipse>
         
-        <DockPanel Style="{StaticResource MainPanel}">
-            <StackPanel x:Name="WindowControls" Style="{StaticResource MenuBar}">
+        <DockPanel Style="{StaticResource MainPanel}" Margin="0">
+            <StackPanel x:Name="WindowControls" Style="{StaticResource MenuBar}" Margin="{Binding Source={x:Static frame:Settings.Instance}, Path=SidebarBorderWidth, Mode=OneWay}">
                 <Button Click="GraphButton_Click" Style="{StaticResource MenuButton}">
                     <Path Width="12" Height="12" Data="M 17,19L 20,19L 20,54L 59,54L 59,57L 17,57L 17,19 Z M 22,52L 22,47.25L 32,37L 45,43.75L 57,25L 59,27L 46,48L 32.25,41L 22,52 Z" />
                 </Button>
@@ -64,8 +64,8 @@
                 </Button>
             </StackPanel>
 
-            <ScrollViewer Style="{StaticResource ContentView}">
-                <StackPanel Style="{StaticResource ContentPanel}">
+            <ScrollViewer Style="{StaticResource ContentView}" Margin="{Binding Source={x:Static frame:Settings.Instance}, Path=SidebarBorderWidth, Mode=OneWay}">
+                <StackPanel Style="{StaticResource ContentPanel}" Margin="0">
                     <ContentControl>
                         <ContentControl.Style>
                             <Style TargetType="{x:Type ContentControl}">
diff --git a/SidebarDiagnostics/SidebarDiagnostics.csproj b/SidebarDiagnostics/SidebarDiagnostics.csproj
index 9463025..5b2361d 100644
--- a/SidebarDiagnostics/SidebarDiagnostics.csproj
+++ b/SidebarDiagnostics/SidebarDiagnostics.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\squirrel.windows.1.9.1\build\squirrel.windows.props" Condition="Exists('..\packages\squirrel.windows.1.9.1\build\squirrel.windows.props')" />
+  <Import Project="..\packages\squirrel.windows.2.0.1\build\squirrel.windows.props" Condition="Exists('..\packages\squirrel.windows.2.0.1\build\squirrel.windows.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -111,23 +111,23 @@
     <Reference Include="Microsoft.Win32.TaskScheduler, Version=2.8.15.0, Culture=neutral, PublicKeyToken=c416bc1b32d97233, processorArchitecture=MSIL">
       <HintPath>..\packages\TaskScheduler.2.8.15\lib\net452\Microsoft.Win32.TaskScheduler.dll</HintPath>
     </Reference>
-    <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll</HintPath>
+    <Reference Include="Mono.Cecil, Version=0.11.2.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.11.2\lib\net40\Mono.Cecil.dll</HintPath>
     </Reference>
-    <Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
+    <Reference Include="Mono.Cecil.Mdb, Version=0.11.2.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.11.2\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
     </Reference>
-    <Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
+    <Reference Include="Mono.Cecil.Pdb, Version=0.11.2.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.11.2\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
     </Reference>
-    <Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
+    <Reference Include="Mono.Cecil.Rocks, Version=0.11.2.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.11.2\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NuGet.Squirrel, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\squirrel.windows.1.9.1\lib\Net45\NuGet.Squirrel.dll</HintPath>
+      <HintPath>..\packages\squirrel.windows.2.0.1\lib\Net45\NuGet.Squirrel.dll</HintPath>
     </Reference>
     <Reference Include="OxyPlot, Version=1.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
       <HintPath>..\packages\OxyPlot.Core.1.0.0\lib\net45\OxyPlot.dll</HintPath>
@@ -143,8 +143,8 @@
     <Reference Include="Splat, Version=5.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Splat.5.1.1\lib\net461\Splat.dll</HintPath>
     </Reference>
-    <Reference Include="Squirrel, Version=1.9.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\squirrel.windows.1.9.1\lib\Net45\Squirrel.dll</HintPath>
+    <Reference Include="Squirrel, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\squirrel.windows.2.0.1\lib\Net45\Squirrel.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -422,10 +422,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\squirrel.windows.1.9.1\build\squirrel.windows.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\squirrel.windows.1.9.1\build\squirrel.windows.props'))" />
-    <Error Condition="!Exists('..\packages\squirrel.windows.1.9.1\build\squirrel.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\squirrel.windows.1.9.1\build\squirrel.windows.targets'))" />
+    <Error Condition="!Exists('..\packages\squirrel.windows.2.0.1\build\squirrel.windows.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\squirrel.windows.2.0.1\build\squirrel.windows.props'))" />
   </Target>
-  <Import Project="..\packages\squirrel.windows.1.9.1\build\squirrel.windows.targets" Condition="Exists('..\packages\squirrel.windows.1.9.1\build\squirrel.windows.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.
   <Target Name="BeforeBuild">
diff --git a/SidebarDiagnostics/packages.config b/SidebarDiagnostics/packages.config
index 2ffc8fa..00246a3 100644
--- a/SidebarDiagnostics/packages.config
+++ b/SidebarDiagnostics/packages.config
@@ -4,13 +4,13 @@
   <package id="Extended.Wpf.Toolkit" version="3.5.0" targetFramework="net471" />
   <package id="gong-wpf-dragdrop" version="2.0.4" targetFramework="net471" />
   <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.8" targetFramework="net461" />
-  <package id="Mono.Cecil" version="0.9.6.4" targetFramework="net471" />
+  <package id="Mono.Cecil" version="0.11.2" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" />
   <package id="OxyPlot.Core" version="1.0.0" targetFramework="net461" />
   <package id="OxyPlot.Wpf" version="1.0.0" targetFramework="net461" />
   <package id="SharpCompress" version="0.17.1" targetFramework="net471" />
   <package id="Splat" version="5.1.1" targetFramework="net471" />
-  <package id="squirrel.windows" version="1.9.1" targetFramework="net471" />
+  <package id="squirrel.windows" version="2.0.1" targetFramework="net472" />
   <package id="System.Drawing.Primitives" version="4.3.0" targetFramework="net471" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net471" />
   <package id="TaskScheduler" version="2.8.15" targetFramework="net471" />