fixed notifyicon text for 16x16 and 32x32 mode

Author: sergiye

GUI/MainForm.cs

@@ -59,8 +59,7 @@ public MainForm() {
       Icon = Icon.ExtractAssociatedIcon(Updater.CurrentFileLocation);
 
       settings = new PersistentSettings();
-      settings.Load(Path.ChangeExtension(
-        Application.ExecutablePath, ".config"));
+      settings.Load(Application.ExecutablePath);
 
       unitManager = new UnitManager(settings);
 

GUI/SensorNotifyIcon.cs

@@ -90,7 +90,7 @@ public SensorNotifyIcon(SystemTray sensorSystemTray, ISensor sensor,
         family = new FontFamily("Segoe UI");
         baseSize = 15;
       } else {
-        family = new FontFamily("Tahome");// SystemFonts.MessageBoxFont.FontFamily;
+        family = SystemFonts.MessageBoxFont.FontFamily;
         baseSize = 14;
       }
 
@@ -209,16 +209,20 @@ private Icon CreateTransparentIcon() {
         graphics.Clear(defaultBackColor);
       }
 
+      var textShift = bitmap.Width / 8 - 1; //todo: tested for 16 & 32 only
       if (small) {
         if (text[1] == '.' || text[1] == ',') {
-          TextRenderer.DrawText(graphics, text.Substring(0, 1), font, new Point(-4, -2), color, defaultBackColor);
-          TextRenderer.DrawText(graphics, text.Substring(1), smallFont, new Point(8, 4), color, defaultBackColor);
+          var bigPart = text.Substring(0, 1);
+          var smallPart = text.Substring(1);
+          TextRenderer.DrawText(graphics, bigPart, font, new Point(-4, -2), color, defaultBackColor);
+          TextRenderer.DrawText(graphics, smallPart, smallFont, new Point(4 * textShift, 1 * textShift), color, defaultBackColor);
+        } else {
+          TextRenderer.DrawText(graphics, text, smallFont, new Point(-2 * textShift, 2 * textShift), color, defaultBackColor);
         }
-        else
-          TextRenderer.DrawText(graphics, text, smallFont, new Point(-4, 1), color, defaultBackColor);
       }
-      else
-        TextRenderer.DrawText(graphics, text, font, new Point(-4, -2), color, defaultBackColor);
+      else {
+        TextRenderer.DrawText(graphics, text, font, new Point(-2 * textShift, -1 * textShift), color, defaultBackColor);
+      }
 
       var data = bitmap.LockBits(
         new Rectangle(0, 0, bitmap.Width, bitmap.Height),

Utilities/PersistentSettings.cs

@@ -13,14 +13,15 @@ public class PersistentSettings : ISettings {
 
     private IDictionary<string, string> settings = new Dictionary<string, string>();
 
-    public void Load(string fileName) {
-      if (!File.Exists(fileName)) return;
+    public void Load(string executablePath) {
+      var configPath = Path.ChangeExtension(executablePath, ".config");
+      if (!File.Exists(configPath)) return;
       try {
-        var json = File.ReadAllText(fileName);
+        var json = File.ReadAllText(configPath);
         settings = json.FromJson<IDictionary<string, string>>();
       }
       catch (Exception) {
-        LoadOld(fileName);
+        LoadOld(configPath);
       }
     }