CreatePercentageIcon border fix

Author: sergiye

GUI/SensorNotifyIcon.cs

@@ -21,7 +21,7 @@ public class SensorNotifyIcon : IDisposable {
     private Color darkColor;
     private Brush brush;
     private Brush darkBrush;
-    private readonly Pen pen;
+    private Pen pen;
     private readonly Font font;
     private readonly Font smallFont;
 
@@ -41,8 +41,6 @@ public SensorNotifyIcon(SystemTray sensorSystemTray, ISensor sensor,
 
       Color = settings.GetValue(new Identifier(sensor.Identifier, "traycolor").ToString(), defaultColor);
 
-      pen = new Pen(Color.FromArgb(96, Color.Black));
-
       var contextMenu = new ContextMenu();
       var hideShowItem = new MenuItem("Hide/Show");
       hideShowItem.DefaultItem = true;
@@ -124,6 +122,10 @@ public Color Color {
         brush = new SolidBrush(color);
         if (tmpBrush != null)
           tmpBrush.Dispose();
+        var tmpPen = pen;
+        pen = new Pen(Color.FromArgb(96, color), 1);
+        if (tmpPen != null)
+          tmpPen.Dispose();
         var tmpDarkBrush = darkBrush;
         darkBrush = new SolidBrush(darkColor);
         if (tmpDarkBrush != null)
@@ -248,8 +250,8 @@ private Icon CreatePercentageIcon() {
       graphics.FillRectangle(darkBrush, 0.5f, -0.5f, bitmap.Width - 2, bitmap.Height);
       var value = sensor.Value.GetValueOrDefault();
       var y = 0.16f * (100 - value);
-      graphics.FillRectangle(brush, 0.5f, -0.5f + y, bitmap.Width - 2, bitmap.Height - y);
-      graphics.DrawRectangle(pen, 1, 0, bitmap.Width - 3, bitmap.Height - 1);
+      graphics.FillRectangle(brush, 2, 2 + y, bitmap.Width - 5, bitmap.Height - 4 - y);
+      graphics.DrawRectangle(pen, 1, 1, bitmap.Width - 3, bitmap.Height - 2);
 
       var data = bitmap.LockBits(
         new Rectangle(0, 0, bitmap.Width, bitmap.Height),

OpenHardwareMonitor.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
-  <Import Project="c:\temp\nuget\Costura.Fody.4.1.0\build\Costura.Fody.props" Condition="Exists('c:\temp\nuget\Costura.Fody.4.1.0\build\Costura.Fody.props')" />
+  <Import Project="..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -67,10 +67,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Costura, Version=4.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
-      <HintPath>c:\temp\nuget\Costura.Fody.4.1.0\lib\net40\Costura.dll</HintPath>
+      <HintPath>..\packages\Costura.Fody.4.1.0\lib\net40\Costura.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>c:\temp\nuget\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration.Install" />
@@ -529,8 +529,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('c:\temp\nuget\Costura.Fody.4.1.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', 'c:\temp\nuget\Costura.Fody.4.1.0\build\Costura.Fody.props'))" />
-    <Error Condition="!Exists('c:\temp\nuget\Fody.6.6.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'c:\temp\nuget\Fody.6.6.3\build\Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props'))" />
+    <Error Condition="!Exists('..\packages\Fody.6.6.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.6.3\build\Fody.targets'))" />
   </Target>
-  <Import Project="c:\temp\nuget\Fody.6.6.3\build\Fody.targets" Condition="Exists('c:\temp\nuget\Fody.6.6.3\build\Fody.targets')" />
+  <Import Project="..\packages\Fody.6.6.3\build\Fody.targets" Condition="Exists('..\packages\Fody.6.6.3\build\Fody.targets')" />
 </Project>