use sergiye.Common IconFactory

sergiye · sergiye · commit f88b1d14d460 · 2025-08-24T17:16:37.000+03:00
diff --git a/TrayRAMBooster/Engine/ComputerService.cs b/TrayRAMBooster/Engine/ComputerService.cs
@@ -10,7 +10,13 @@
 namespace TrayRAMBooster {
   
   internal class ComputerService {
-    
+
+    public static bool HasCombinedPageList => OperatingSystemHelper.IsWindows8OrGreater;
+    public static bool HasModifiedPageList => OperatingSystemHelper.IsWindowsVistaOrGreater;
+    public static bool HasProcessesWorkingSet => OperatingSystemHelper.IsWindowsXpOrGreater;
+    public static bool HasStandbyList => OperatingSystemHelper.IsWindowsVistaOrGreater;
+    public static bool HasSystemWorkingSet => OperatingSystemHelper.IsWindowsXpOrGreater;
+
     private WindowsStructs.MemoryStatusEx memoryStatusEx;
 
     public ComputerService() {
@@ -214,7 +220,7 @@ public void Optimize(Enums.MemoryAreas areas, Enums.OptimizationReason reason) {
     }
 
     private static void OptimizeCombinedPageList() {
-      if (!OperatingSystem.HasCombinedPageList)
+      if (!HasCombinedPageList)
         throw new Exception("The Combined Page List optimization is not supported on this operating system version");
 
       if (!SetIncreasePrivilege(Constants.Windows.Privilege.SeProfSingleProcessName))
@@ -243,7 +249,7 @@ private static void OptimizeCombinedPageList() {
     }
 
     private static void OptimizeModifiedPageList() {
-      if (!OperatingSystem.HasModifiedPageList)
+      if (!HasModifiedPageList)
         throw new Exception("The Modified Page List optimization is not supported on this operating system version");
 
       if (!SetIncreasePrivilege(Constants.Windows.Privilege.SeProfSingleProcessName))
@@ -271,7 +277,7 @@ private static void OptimizeModifiedPageList() {
     }
 
     private static void OptimizeProcessesWorkingSet() {
-      if (!OperatingSystem.HasProcessesWorkingSet)
+      if (!HasProcessesWorkingSet)
         throw new Exception("The Processes Working Set optimization is not supported on this operating system version");
 
       if (!SetIncreasePrivilege(Constants.Windows.Privilege.SeDebugName))
@@ -302,7 +308,7 @@ private static void OptimizeProcessesWorkingSet() {
     }
 
     private static void OptimizeStandbyList(bool lowPriority = false) {
-      if (!OperatingSystem.HasStandbyList)
+      if (!HasStandbyList)
         throw new Exception("The Standby List optimization is not supported on this operating system version");
 
       if (!SetIncreasePrivilege(Constants.Windows.Privilege.SeProfSingleProcessName))
@@ -332,7 +338,7 @@ private static void OptimizeStandbyList(bool lowPriority = false) {
     }
 
     private static void OptimizeSystemWorkingSet() {
-      if (!OperatingSystem.HasSystemWorkingSet)
+      if (!HasSystemWorkingSet)
         throw new Exception("The System Working Set optimization is not supported on this operating system version");
 
       if (!SetIncreasePrivilege(Constants.Windows.Privilege.SeIncreaseQuotaName))
diff --git a/TrayRAMBooster/Engine/ExtensionMethods.cs b/TrayRAMBooster/Engine/ExtensionMethods.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 
 namespace TrayRAMBooster {
@@ -34,20 +33,5 @@ public static string RemoveWhitespaces(this string value) {
       var mag = (int) Math.Log(value, 1024);
       return new KeyValuePair<double, Enums.MemoryUnit>(value / Math.Pow(1024, mag), (Enums.MemoryUnit) mag);
     }
-
-    public static bool IsDark(this Color color) {
-      var brightness = (0.299 * color.R + 0.587 * color.G + 0.114 * color.B);
-      return brightness < 186;
-    }
-
-    public static string ToTrayValue(this double value) {
-      double rounded1 = Math.Round(value, 1);
-      return rounded1 < 10 ? rounded1.ToString("0.0") : Math.Round(value).ToString("0");
-    }
-
-    public static void Destroy(this Icon icon) {
-      NativeMethods.DestroyIcon(icon.Handle);
-      icon.Dispose();
-    }
   }
 }
diff --git a/TrayRAMBooster/Engine/NativeMethods.cs b/TrayRAMBooster/Engine/NativeMethods.cs
@@ -1,7 +1,4 @@
 ﻿using System;
-using System.ComponentModel;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.Runtime.InteropServices;
 
 namespace TrayRAMBooster {
@@ -14,10 +11,6 @@ internal static extern bool AdjustTokenPrivileges(IntPtr tokenHandle,
       [MarshalAs(UnmanagedType.Bool)] bool disableAllPrivileges, ref WindowsStructs.TokenPrivileges newState,
       int bufferLength, IntPtr previousState, IntPtr returnLength);
 
-    [DllImport("user32.dll", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    internal static extern bool DestroyIcon(IntPtr hIcon);
-
     [DllImport("psapi.dll", SetLastError = true)]
     internal static extern bool EmptyWorkingSet(IntPtr hProcess);
 
@@ -37,58 +30,5 @@ internal static extern bool AdjustTokenPrivileges(IntPtr tokenHandle,
     [return: MarshalAs(UnmanagedType.Bool)]
     internal static extern bool SetSystemFileCacheSize(IntPtr minimumFileCacheSize, IntPtr maximumFileCacheSize,
       int flags);
-    
-    private struct APPBARDATA {
-      public int cbSize;
-      public IntPtr hWnd;
-      public int uCallbackMessage;
-      public int uEdge;
-      public RECT rc;
-      public IntPtr lParam;
-    }
-
-    private struct RECT {
-      public int left, top, right, bottom;
-    }
-
-    private const int ABM_GETTASKBARPOS = 5;
-
-    [DllImport("shell32.dll")]
-    private static extern IntPtr SHAppBarMessage(int msg, ref APPBARDATA data);
-
-    [DllImport("gdi32.dll", CharSet = CharSet.Auto, SetLastError = true, ExactSpelling = true)]
-    private static extern int BitBlt(IntPtr hDC, int x, int y, int nWidth, int nHeight, IntPtr hSrcDC, int xSrc,
-      int ySrc, int dwRop);
-
-    private static Rectangle GetTaskbarPosition() {
-      var data = new APPBARDATA();
-      data.cbSize = Marshal.SizeOf(data);
-
-      var retval = SHAppBarMessage(ABM_GETTASKBARPOS, ref data);
-      if (retval == IntPtr.Zero) {
-        throw new Win32Exception("Please re-install Windows");
-      }
-
-      return new Rectangle(data.rc.left, data.rc.top, data.rc.right - data.rc.left, data.rc.bottom - data.rc.top);
-    }
-
-    private static Color GetColorAt(Point location) {
-      using (var screenPixel = new Bitmap(1, 1, PixelFormat.Format32bppArgb))
-      using (var gDst = Graphics.FromImage(screenPixel)) {
-        using (var gSrc = Graphics.FromHwnd(IntPtr.Zero)) {
-          var hSrcDC = gSrc.GetHdc();
-          var hDC = gDst.GetHdc();
-          var retVal = BitBlt(hDC, 0, 0, 1, 1, hSrcDC, location.X, location.Y, (int) CopyPixelOperation.SourceCopy);
-          gDst.ReleaseHdc();
-          gSrc.ReleaseHdc();
-        }
-
-        return screenPixel.GetPixel(0, 0);
-      }
-    }
-
-    public static Color GetTaskbarColor() {
-      return GetColorAt(GetTaskbarPosition().Location);
-    }
   }
 }
diff --git a/TrayRAMBooster/Engine/OperatingSystem.cs b/TrayRAMBooster/Engine/OperatingSystem.cs
diff --git a/TrayRAMBooster/Engine/Settings.cs b/TrayRAMBooster/Engine/Settings.cs
@@ -3,6 +3,7 @@
 using System.Drawing;
 using System.Linq;
 using Microsoft.Win32;
+using sergiye.Common;
 
 namespace TrayRAMBooster {
 
@@ -32,8 +33,7 @@ static Settings() {
       showVirtualMemory = true;
       trayIconMode = Enums.TrayIconMode.MemoryAvailable;
       doubleClickAction = Enums.DoubleClickAction.Optimize;
-      var taskbarColor = NativeMethods.GetTaskbarColor(); 
-      trayIconValueColor = taskbarColor.IsDark() 
+      trayIconValueColor = WinApiHelper.IsTaskbarDark() 
         ? Color.Lime //Cyan / SpringGreen
         : Color.DarkGreen; //Teal / Green
 
diff --git a/TrayRAMBooster/TrayApplicationContext.cs b/TrayRAMBooster/TrayApplicationContext.cs
@@ -2,9 +2,6 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Drawing.Imaging;
-using System.Drawing.Text;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -20,6 +17,7 @@ internal class TrayApplicationContext : ApplicationContext {
 
     private readonly Icon imageIcon;
     private readonly NotifyIcon notifyIcon;
+    private readonly IconFactory iconFactory;
     private readonly SynchronizationContext uiContext;
     private readonly ComputerService computer;
     private readonly StartupManager startupManager;
@@ -30,10 +28,6 @@ internal class TrayApplicationContext : ApplicationContext {
     private ToolStripMenuItem autoOptimizeUsageMenu;
     private ToolStripMenuItem updateIntervalMenu;
     private ToolStripMenuItem optimizationTypesMenu;
-    private readonly Bitmap bitmap;
-    private readonly Graphics graphics;
-    private readonly Font font;
-    private readonly Font smallFont;
     private bool isBusy;
     private string iconValue;
     private DateTimeOffset lastRun;
@@ -87,24 +81,7 @@ public TrayApplicationContext() {
       };
       notifyIcon.ContextMenuStrip.Renderer = new ThemedToolStripRenderer();
       uiContext = SynchronizationContext.Current;
-      
-      float dpiX, dpiY;
-      using (var b = new Bitmap(1, 1, PixelFormat.Format32bppArgb)) {
-        dpiX = b.HorizontalResolution;
-        dpiY = b.VerticalResolution;
-      }
-      var width = Math.Max(16, (int)Math.Round(16 * dpiX / 96));
-      var height = Math.Max(16, (int)Math.Round(16 * dpiY / 96));
-      bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
-      graphics = Graphics.FromImage(bitmap);
-      if (OperatingSystem.IsWindowsXpOrGreater) {
-        graphics.TextRenderingHint = TextRenderingHint.AntiAliasGridFit;
-        graphics.SmoothingMode = SmoothingMode.AntiAlias;
-        graphics.InterpolationMode = InterpolationMode.HighQualityBicubic;
-        graphics.PixelOffsetMode = PixelOffsetMode.HighQuality;
-      }
-      font = new Font("Arial", width == 16 ? 10.0F : 8.0F * dpiX / 96);
-      smallFont = new Font("Arial", width == 16 ? 8.0F : 6.0F * dpiX / 96);
+      iconFactory = new IconFactory(Settings.TrayIconValueColor);
 
       Updater.Subscribe(
         (message, isError) => {
@@ -202,65 +179,9 @@ private void UpdateIcon(bool force = false) {
       }
       else {
         try {
-          var color = Settings.TrayIconValueColor;
-          var iconBackColor = Color.Transparent;
-          graphics.Clear(iconBackColor);
-
-          if (optimizationProgressPercentage > 0) {
-            var rect = new Rectangle(1, 1, bitmap.Width - 2, bitmap.Height - 2);
-            // var backColor = NativeMethods.GetTaskbarColor(); 
-            // using (var b = new SolidBrush(backColor))
-            //   graphics.FillEllipse(b, rect);
-            var sweepAngle = 360f * optimizationProgressPercentage / 100f;
-            if (sweepAngle > 0) {
-              using (var b = new SolidBrush(color))
-                graphics.FillPie(b, rect, -90, sweepAngle);
-            }
-            using (var p = new Pen(color, 1))
-              graphics.DrawEllipse(p, rect);
-      
-            // var text = value.ToString(); //optimizationProgressPercentage.ToString();
-            // using (var path = new GraphicsPath()) {
-            //   var emSize = graphics.DpiY * smallFont.Size / 72;
-            //   var format = new StringFormat {Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center};
-            //   path.AddString(text, smallFont.FontFamily, (int) smallFont.Style, emSize, new RectangleF(0, 0, bitmap.Width, bitmap.Height), format);
-            //   using (var outline = new Pen(fillColor, 2)) {
-            //     outline.LineJoin = LineJoin.Round;
-            //     graphics.DrawPath(outline, path);
-            //   }
-            //   using (var brush = new SolidBrush(backColor)) graphics.FillPath(brush, path);
-            // }
-          }
-          else {
-            var small = iconValue.Length > 2;
-            if (small) {
-              if (iconValue[1] == '.' || iconValue[1] == ',') {
-                var bigPart = iconValue.Substring(0, 1);
-                var smallPart = iconValue.Substring(1);
-                TextRenderer.DrawText(graphics, bigPart, font, new Point(-bitmap.Width / 4, bitmap.Height / 2), color,
-                  iconBackColor, TextFormatFlags.VerticalCenter);
-                TextRenderer.DrawText(graphics, smallPart, smallFont, new Point(bitmap.Width / 4, bitmap.Height), color,
-                  iconBackColor, TextFormatFlags.Bottom);
-              }
-              else {
-                var size = TextRenderer.MeasureText(iconValue, smallFont);
-                TextRenderer.DrawText(graphics, iconValue, smallFont,
-                  new Point((bitmap.Width - size.Width) / 2, bitmap.Height / 2), color, iconBackColor,
-                  TextFormatFlags.VerticalCenter);
-              }
-            }
-            else {
-              var size = TextRenderer.MeasureText(iconValue, font);
-              TextRenderer.DrawText(graphics, iconValue, font,
-                new Point((bitmap.Width - size.Width) / 2, bitmap.Height / 2), color, iconBackColor,
-                TextFormatFlags.VerticalCenter);
-            }
-          }
-
-          var handle = bitmap.GetHicon();
-          using (var icon = Icon.FromHandle(handle))
-            SafeSetTrayIcon((Icon) icon.Clone());
-          NativeMethods.DestroyIcon(handle);
+          SafeSetTrayIcon(optimizationProgressPercentage > 0
+            ? iconFactory.CreatePercentagePieIcon(optimizationProgressPercentage)
+            : iconFactory.CreateTransparentIcon(iconValue));
         }
         catch {
           SafeSetTrayIcon(imageIcon);
@@ -278,17 +199,17 @@ private void OnOptimizeProgressUpdate(byte value, string step) {
     }
 
     private static Enums.MemoryAreas GetEnabledMemoryAreas() {
-      if (!OperatingSystem.HasCombinedPageList)
+      if (!ComputerService.HasCombinedPageList)
         Settings.MemoryAreas &= ~Enums.MemoryAreas.CombinedPageList;
-      if (!OperatingSystem.HasModifiedPageList)
+      if (!ComputerService.HasModifiedPageList)
         Settings.MemoryAreas &= ~Enums.MemoryAreas.ModifiedPageList;
-      if (!OperatingSystem.HasProcessesWorkingSet)
+      if (!ComputerService.HasProcessesWorkingSet)
         Settings.MemoryAreas &= ~Enums.MemoryAreas.ProcessesWorkingSet;
-      if (!OperatingSystem.HasStandbyList) {
+      if (!ComputerService.HasStandbyList) {
         Settings.MemoryAreas &= ~Enums.MemoryAreas.StandbyList;
         Settings.MemoryAreas &= ~Enums.MemoryAreas.StandbyListLowPriority;
       }
-      if (!OperatingSystem.HasSystemWorkingSet)
+      if (!ComputerService.HasSystemWorkingSet)
         Settings.MemoryAreas &= ~Enums.MemoryAreas.SystemWorkingSet;
       return Settings.MemoryAreas;
     }
@@ -540,23 +461,23 @@ private void AddMenuItems() {
 
       #region Optimization types
       optimizationTypesMenu = new ToolStripMenuItem("Optimization types");
-      if (OperatingSystem.HasProcessesWorkingSet) 
+      if (ComputerService.HasProcessesWorkingSet) 
         optimizationTypesMenu.DropDownItems.Add(new ToolStripMenuItem("Processes working set", null, (_, _) => {
           ToggleMemoryArea(Enums.MemoryAreas.ProcessesWorkingSet);
         }) { Tag = Enums.MemoryAreas.ProcessesWorkingSet });
-      if (OperatingSystem.HasSystemWorkingSet)
+      if (ComputerService.HasSystemWorkingSet)
         optimizationTypesMenu.DropDownItems.Add(new ToolStripMenuItem("System working set", null, (_, _) => {
           ToggleMemoryArea(Enums.MemoryAreas.SystemWorkingSet);
         }) { Tag = Enums.MemoryAreas.SystemWorkingSet });
-      if (OperatingSystem.HasCombinedPageList)
+      if (ComputerService.HasCombinedPageList)
         optimizationTypesMenu.DropDownItems.Add(new ToolStripMenuItem("Combined page list", null, (_, _) => {
           ToggleMemoryArea(Enums.MemoryAreas.CombinedPageList);
         }) { Tag = Enums.MemoryAreas.CombinedPageList });
-      if (OperatingSystem.HasModifiedPageList) 
+      if (ComputerService.HasModifiedPageList) 
         optimizationTypesMenu.DropDownItems.Add(new ToolStripMenuItem("Modified page list", null, (_, _) => {
           ToggleMemoryArea(Enums.MemoryAreas.ModifiedPageList);
         }) { Tag = Enums.MemoryAreas.ModifiedPageList });
-      if (OperatingSystem.HasStandbyList) {
+      if (ComputerService.HasStandbyList) {
         optimizationTypesMenu.DropDownItems.Add(new ToolStripMenuItem("Standby list", null, (_, _) => {
           ToggleMemoryArea(Enums.MemoryAreas.StandbyList);
         }) { Tag = Enums.MemoryAreas.StandbyList });
@@ -704,10 +625,7 @@ protected override void Dispose(bool disposing) {
       components.Dispose();
       imageIcon?.Dispose();
       notifyIcon?.Dispose();
-      graphics?.Dispose();
-      bitmap?.Dispose();
-      font?.Dispose();
-      smallFont?.Dispose();
+      iconFactory?.Dispose();
       GC.SuppressFinalize(this);
     }
 
