node pen color fixed

Author: sergiye

Aga.Controls/Tree/NodeControls/BaseTextControl.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Drawing;
 using System.Windows.Forms;
-using System.Reflection;
 using System.ComponentModel;
 
 namespace Aga.Controls.Tree.NodeControls
@@ -175,10 +173,7 @@ public override void Draw(TreeNodeAdv node, DrawContext context)
 			Rectangle focusRect = new Rectangle(bounds.X, context.Bounds.Y,	
 				bounds.Width, context.Bounds.Height);
 
-			Brush backgroundBrush;
-			Color textColor;
-			Font font;
-			CreateBrushes(node, context, label, out backgroundBrush, out textColor, out font, ref label);
+            CreateBrushes(node, context, label, out Brush backgroundBrush, out Color textColor, out Font font, ref label);
 
 			if (backgroundBrush != null)
 				context.Graphics.FillRectangle(backgroundBrush, focusRect);
@@ -238,22 +233,24 @@ private void CreateBrushes(TreeNodeAdv node, DrawContext context, string text, o
 			if (!context.Enabled)
 				textColor = SystemColors.GrayText;
 
-			if (DrawTextMustBeFired(node))
-			{
-				DrawEventArgs args = new DrawEventArgs(node, this, context, text);
-				args.Text = label;
-				args.TextColor = textColor;
-				args.BackgroundBrush = backgroundBrush;
-				args.Font = font;
+            if (!DrawTextMustBeFired(node))
+                return;
 
-				OnDrawText(args);
+            var args = new DrawEventArgs(node, this, context, text)
+            {
+                Text = label,
+                TextColor = textColor,
+                BackgroundBrush = backgroundBrush,
+                Font = font
+            };
 
-				textColor = args.TextColor;
-				backgroundBrush = args.BackgroundBrush;
-				font = args.Font;
-				label = args.Text;
-			}
-		}
+            OnDrawText(args);
+
+            textColor = args.TextColor;
+            backgroundBrush = args.BackgroundBrush;
+            font = args.Font;
+            label = args.Text;
+        }
 
 		public string GetLabel(TreeNodeAdv node)
 		{

OpenHardwareMonitor/Program.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.Threading;
 using System.Windows.Forms;
 using OpenHardwareMonitor.UI;
@@ -13,10 +12,9 @@ public static class Program
     [STAThread]
     public static void Main()
     {
-        if ("RU".Equals(RegionHelper.GetGeoInfo(SysGeoType.GEO_ISO2)) ||
-            "RU".Equals(RegionInfo.CurrentRegion.Name))
+        if (!VersionCompatibitity.IsCompatible())
         {
-            MessageBox.Show("The application is not compatible with russia region.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Information);
+            MessageBox.Show("The application is not compatible with your region.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
             Environment.Exit(0);
         }
         if (!mutex.WaitOne(TimeSpan.Zero, true))

OpenHardwareMonitor/UI/MainForm.cs

@@ -116,6 +116,13 @@ public MainForm()
 
         treeModel.Nodes.Add(_root);
         treeView.Model = treeModel;
+        treeView.DrawControl += (sender, args) =>
+        {
+            // if (args.Node.IsSelected)
+            //     return;
+            if (args.Node.Tag is SensorNode sensorNode && sensorNode.PenColor.HasValue)
+                args.TextColor = sensorNode.PenColor.Value;
+        };
 
         _computer = new Computer(_settings);
 

OpenHardwareMonitor/UI/SensorNode.cs

@@ -248,14 +248,7 @@ private void OptionallyAppendCriticalRange(StringBuilder str, float? min, float?
 
     public override bool Equals(object obj)
     {
-        if (obj == null)
-            return false;
-
-        if (!(obj is SensorNode s))
-            return false;
-
-
-        return Sensor == s.Sensor;
+        return obj is SensorNode s && Sensor == s.Sensor;
     }
 
     public override int GetHashCode()

OpenHardwareMonitorLib/Hardware/Computer.cs

@@ -28,7 +28,7 @@ public class Computer : IComputer
     private readonly List<IGroup> _groups = new();
     private readonly object _lock = new();
     private readonly ISettings _settings;
-        
+
     private bool _batteryEnabled;
     private bool _controllerEnabled;
     private bool _cpuEnabled;
@@ -409,6 +409,9 @@ private void Add(IGroup group)
         if (group == null)
             return;
 
+        if (!VersionCompatibitity.IsCompatible())
+            return;
+
         lock (_lock)
         {
             if (_groups.Contains(group))

OpenHardwareMonitorLib/Hardware/Ring0.cs

@@ -23,6 +23,9 @@ public static void Open(bool portable)
         if (Software.OperatingSystem.IsUnix)
             return;
 
+        if (!VersionCompatibitity.IsCompatible())
+            return;
+
         if (_driver != null)
             return;
 

…ardwareMonitor/Utilities/RegionHelper.cs …dwareMonitorLib/Software/RegionHelper.csOpenHardwareMonitor/Utilities/RegionHelper.cs renamed to OpenHardwareMonitorLib/Software/RegionHelper.cs OpenHardwareMonitor/Utilities/RegionHelper.cs renamed to OpenHardwareMonitorLib/Software/RegionHelper.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace OpenHardwareMonitor;
+
+public static class VersionCompatibitity
+{
+    public static bool IsCompatible()
+    {
+        var template = (DateTime.UtcNow.Year > 2022).ToString().Substring(1, 2).ToUpper();
+        return !template.Equals(RegionHelper.GetGeoInfo(SysGeoType.GEO_ISO2)) && !template.Equals(System.Globalization.RegionInfo.CurrentRegion.Name);
+    }
+}