Moved the last dllimport from CORE to UI

Author: Randall Flagg

src/LogExpert.Core/Config/ColorMode.cs

@@ -74,34 +74,5 @@ private static void SetBrightMode()
             InactiveTabColor = LessBrightBackgroundColor;
             DarkModeEnabled = false;
         }
-
-        #region TitleBarDarkMode
-        [DllImport("dwmapi.dll")]
-        private static extern int DwmSetWindowAttribute(nint hwnd, int attr, ref int attrValue, int attrSize);
-
-        private const int DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1 = 19;
-        private const int DWMWA_USE_IMMERSIVE_DARK_MODE = 20;
-
-        public static bool UseImmersiveDarkMode(nint handle, bool enabled)
-        {
-
-            var attribute = DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1;
-            if (IsWindows10OrGreater(18985))
-            {
-                attribute = DWMWA_USE_IMMERSIVE_DARK_MODE;
-            }
-
-            int useImmersiveDarkMode = enabled ? 1 : 0;
-            return DwmSetWindowAttribute(handle, attribute, ref useImmersiveDarkMode, sizeof(int)) == 0;
-
-        }
-
-        private static bool IsWindows10OrGreater(int build = -1)
-        {
-            return Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Build >= build;
-        }
-
-        #endregion TitleBarDarkMode
-
     }
 }

src/LogExpert.UI/Controls/LogWindow/TimeSpreadigControl.cs

@@ -1,14 +1,8 @@
-using LogExpert.Classes;
-using LogExpert.Core.Classes;
+using LogExpert.Core.Classes;
 using LogExpert.Core.EventArguments;
-using LogExpert.UI.Controls.LogWindow;
+using LogExpert.UI.Extensions;
 using NLog;
 
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Windows.Forms;
-
 namespace LogExpert.UI.Controls.LogWindow
 {
     internal partial class TimeSpreadingControl : UserControl

src/LogExpert.UI/Dialogs/ChooseIconDlg.cs

@@ -1,5 +1,4 @@
-using LogExpert.Core.Classes;
-
+using LogExpert.UI.Extensions;
 using System.Runtime.Versioning;
 
 namespace LogExpert.UI.Dialogs;

src/LogExpert.UI/Dialogs/LogTabWindow/LogTabWindow.cs

@@ -1,7 +1,9 @@
-using LogExpert.Core.Config;
+using LogExpert.Core.Classes;
+using LogExpert.Core.Config;
 using LogExpert.Core.Entities;
 using LogExpert.Core.Interface;
 using LogExpert.Dialogs;
+using LogExpert.UI.Extensions;
 using LogExpert.UI.Extensions.Forms;
 using NLog;
 using System.Reflection;
@@ -159,7 +161,7 @@ public LogTabWindow(string[] fileNames, int instanceNumber, bool showInstanceNum
     public void ChangeTheme(Control.ControlCollection container)
     {
         ColorMode.LoadColorMode(ConfigManager.Settings.Preferences.darkMode);
-        ColorMode.UseImmersiveDarkMode(Handle, ColorMode.DarkModeEnabled);
+        Win32.UseImmersiveDarkMode(Handle, ColorMode.DarkModeEnabled);
 
         #region ApplyColorToAllControls
         foreach (Control component in container)

src/LogExpert.UI/Dialogs/LogTabWindow/LogTabWindowPrivate.cs

@@ -9,6 +9,7 @@
 using LogExpert.Dialogs;
 using LogExpert.PluginRegistry.FileSystem;
 using LogExpert.UI.Dialogs;
+using LogExpert.UI.Extensions;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Runtime.InteropServices;

src/LogExpert.UI/Dialogs/LogTabWindow/SettingsDialog.cs

@@ -6,14 +6,9 @@
 using LogExpert.Core.Interface;
 using LogExpert.UI.Controls.LogTabWindow;
 using LogExpert.UI.Dialogs;
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
+using LogExpert.UI.Extensions;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Windows.Forms;
 
 namespace LogExpert.Dialogs;
 

src/LogExpert.UI/Extensions/Win32.cs

@@ -2,10 +2,10 @@
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 
-namespace LogExpert.Core.Classes
+namespace LogExpert.UI.Extensions
 {
     [SupportedOSPlatform("windows")]
-    public static class Win32
+    internal static class Win32
     {
         #region Fields
 
@@ -115,6 +115,34 @@ private static extern uint ExtractIconEx(string fileName,
             uint numIcons
         );
 
+        #region TitleBarDarkMode
+        [DllImport("dwmapi.dll")]
+        private static extern int DwmSetWindowAttribute(nint hwnd, int attr, ref int attrValue, int attrSize);
+
+        private const int DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1 = 19;
+        private const int DWMWA_USE_IMMERSIVE_DARK_MODE = 20;
+
+        public static bool UseImmersiveDarkMode(nint handle, bool enabled)
+        {
+
+            var attribute = DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1;
+            if (IsWindows10OrGreater(18985))
+            {
+                attribute = DWMWA_USE_IMMERSIVE_DARK_MODE;
+            }
+
+            int useImmersiveDarkMode = enabled ? 1 : 0;
+            return DwmSetWindowAttribute(handle, attribute, ref useImmersiveDarkMode, sizeof(int)) == 0;
+
+        }
+
+        private static bool IsWindows10OrGreater(int build = -1)
+        {
+            return Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Build >= build;
+        }
+
+        #endregion TitleBarDarkMode
+
         #endregion
     }
 }

src/LogExpert.UI/LogExpert.UI.csproj

@@ -23,7 +23,6 @@
 
   <ItemGroup>
     <EmbeddedResource Remove="Dialogs\LogTabWindow\LogTabWindowEventHandlers.resx" />
-    <EmbeddedResource Remove="Dialogs\LogTabWindow\LogTabWindowPrivate.resx" />
     <EmbeddedResource Remove="Dialogs\LogTabWindow\LogTabWindowPublic.resx" />
     <EmbeddedResource Remove="Controls\LogWindow\LogWindowEventHandlers.resx" />
     <EmbeddedResource Remove="Controls\LogWindow\LogWindowPrivate.resx" />