1.5.7

-Fix: If  a monitor is in HDR mode, but Auto HDR is not activated for it, HDRProfile cannot activate HDR, because recognize it as it is already activated

Author: Codectory

Source/HDRProfile/HDRProfileHandler.cs

@@ -160,7 +160,7 @@ private void MonitorManager_HDRIsActiveChanged(object sender, EventArgs e)
         private void MonitorManager_AutoHDRChanged(object sender, EventArgs e)
         {
             SaveSettings();
-            UpdateHDRBasedOnCurrentApplication();
+            SetHDRBasedOnCurrentApplication();
         }
 
         private void TrayMenuHelper_OpenViewRequested(object sender, EventArgs e)
@@ -242,7 +242,7 @@ private void Settings_PropertyChanged(object sender, PropertyChangedEventArgs e)
                     Logs.AddException(ex);
                 }
                 if (e.PropertyName.Equals(nameof(Settings.HDRMode)))
-                    UpdateHDRBasedOnCurrentApplication();
+                    SetHDRBasedOnCurrentApplication();
                 Logs.LoggingEnabled = Settings.Logging;
                 SaveSettings();
             }
@@ -264,13 +264,13 @@ private void StartApplication(ApplicationItem application)
             try
             {
                 MonitorManager.ActivateHDR();
-                System.Threading.Thread.Sleep(3000);
+                System.Threading.Thread.Sleep(2500);
                 Process process = new Process();
                 process.StartInfo = new ProcessStartInfo(application.ApplicationFilePath);
                 process.Start();
                 Stopwatch stopwatch = new Stopwatch();
                 stopwatch.Start();
-                System.Threading.Thread.Sleep(3000);
+                System.Threading.Thread.Sleep(500);
             }
             catch (Exception ex)
             {
@@ -316,7 +316,7 @@ public void Start()
                 MonitorManager.StartMonitoring();
                 Logs.Add($"HDR Monitoring started", false);
                 Started = true;
-                UpdateHDRBasedOnCurrentApplication();
+                SetHDRBasedOnCurrentApplication();
 
             }
         }
@@ -413,11 +413,11 @@ private void RemoveApplication(ApplicationItem process)
         private void ProcessWatcher_RunningOrFocusedChanged(object sender, EventArgs e)
         {
             CurrentApplication = ProcessWatcher.CurrentRunningApplicationItem;
-            UpdateHDRBasedOnCurrentApplication();
+            SetHDRBasedOnCurrentApplication();
 
         }
 
-        private void UpdateHDRBasedOnCurrentApplication()
+        private void SetHDRBasedOnCurrentApplication()
         {
             lock (_accessLock)
             {

Source/HDRProfile/MonitorManager.cs

@@ -4,6 +4,7 @@
 using CodectoryCore.UI.Wpf;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Drawing;
 using System.Linq;
 using System.Management;
@@ -53,6 +54,7 @@ public struct DISPLAY_DEVICE
     }
 
 
+
     public class MonitorManager : BaseViewModel
     {
         [DllImport("user32.dll")]
@@ -77,9 +79,8 @@ public class MonitorManager : BaseViewModel
 
         public event EventHandler AutoHDRChanged;
 
-        //private List<Monitor> _monitors = new List<Monitor>();
 
-        //public List<Monitor> Monitors { get => _monitors; set { _monitors = value; OnPropertyChanged(); } }
+        public ObservableCollection<Monitor> Monitors => Settings.Monitors;
 
         public MonitorManager(HDRProfileSettings settings)
         {
@@ -118,17 +119,21 @@ private void HDRMonitorLoop()
         {
             while (!_monitorCancelRequested)
             {
-                foreach (Monitor monitor in Settings.Monitors)
-                    monitor.HDRState = HDRController.GetHDRState(monitor.UID);
+                bool currentValue = false;
 
-                bool currentValue = HDRController.GetGlobalHDRState();
+                foreach (Monitor monitor in Monitors)
+                {
+                    monitor.UpdateHDRState();
+                    if (monitor.AutoHDR)
+                        currentValue = currentValue || monitor.HDRState;
+                }
                 bool changed = GlobalHDRIsActive != currentValue;
                 GlobalHDRIsActive = currentValue;
                 if (changed)
                 {
                     try { HDRIsActiveChanged?.Invoke(null, EventArgs.Empty); } catch { }
                 }
-                System.Threading.Thread.Sleep(50);
+                System.Threading.Thread.Sleep(100);
             }
         }
 
@@ -209,27 +214,27 @@ private void MergeMonitors(List<Monitor> monitors)
         {
 
             List<Monitor> toRemove = new List<Monitor>();
-            foreach (Monitor monitor in Settings.Monitors)
+            foreach (Monitor monitor in Monitors)
             {
                 if (!monitors.Any(m => m.UID.Equals(monitor.UID)))
                     toRemove.Add(monitor);
             }
             foreach (Monitor monitor in toRemove)
-                Settings.Monitors.Remove(monitor);
+                Monitors.Remove(monitor);
             foreach (Monitor monitor in monitors)
             {
                 if (!Settings.Monitors.Any(m => m.UID.Equals(monitor.UID)))
                     Settings.Monitors.Add(monitor);
                 else
                 {
-                   Monitor existingMonitor = Settings.Monitors.First(m => m.UID.Equals(monitor.UID));
+                   Monitor existingMonitor = Monitors.First(m => m.UID.Equals(monitor.UID));
                     existingMonitor.Name = monitor.Name;
                     existingMonitor.RefreshRate = monitor.RefreshRate;
                     existingMonitor.Resolution = monitor.Resolution;
                 }
             }
 
-            foreach (Monitor monitor in Settings.Monitors)
+            foreach (Monitor monitor in Monitors)
             {
                 monitor.PropertyChanged += Monitor_PropertyChanged;
             }

Source/HDRProfile/Properties/AssemblyInfo.cs

@@ -52,5 +52,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.6.0")]
-[assembly: AssemblyFileVersion("1.5.6.0")]
+[assembly: AssemblyVersion("1.5.7.0")]
+[assembly: AssemblyFileVersion("1.5.7.0")]