Toolbar Icon for darkmode for Npp >= 8

Author: Sébastien Geiser

CSharpRegexTools4Npp/Main.cs

@@ -77,15 +77,34 @@ internal static void CommandMenuInit()
 
         internal static void SetToolBarIcon()
         {
-            toolbarIcons tbIcons = new toolbarIcons
+            if (!string.IsNullOrEmpty(BNpp.NotepadPP.NppBinVersion)
+                && int.TryParse(BNpp.NotepadPP.NppBinVersion.Split('.')[0], out int majorVersion)
+                && majorVersion >= 8)
             {
-                hToolbarBmp = tbBmp.GetHbitmap()
-            };
+                toolbarIconsWithDarkMode tbIcons = new toolbarIconsWithDarkMode
+                {
+                    hToolbarBmp = tbBmp.GetHbitmap(),
+                    hToolbarIcon = tbBmp.GetHicon(),
+                    hToolbarIconDarkMode = tbBmp.GetHicon()
+                };
+
+                IntPtr pTbIcons = Marshal.AllocHGlobal(Marshal.SizeOf(tbIcons));
+                Marshal.StructureToPtr(tbIcons, pTbIcons, false);
+                Win32.SendMessage(PluginBase.nppData._nppHandle, (uint)NppMsg.NPPM_ADDTOOLBARICON_FORDARKMODE, PluginBase._funcItems.Items[idMyDlg]._cmdID, pTbIcons);
+                Marshal.FreeHGlobal(pTbIcons);
+            }
+            else
+            {
+                toolbarIcons tbIcons = new toolbarIcons
+                {
+                    hToolbarBmp = tbBmp.GetHbitmap()
+                };
 
-            IntPtr pTbIcons = Marshal.AllocHGlobal(Marshal.SizeOf(tbIcons));
-            Marshal.StructureToPtr(tbIcons, pTbIcons, false);
-            Win32.SendMessage(PluginBase.nppData._nppHandle, (uint)NppMsg.NPPM_ADDTOOLBARICON, PluginBase._funcItems.Items[idMyDlg]._cmdID, pTbIcons);
-            Marshal.FreeHGlobal(pTbIcons);
+                IntPtr pTbIcons = Marshal.AllocHGlobal(Marshal.SizeOf(tbIcons));
+                Marshal.StructureToPtr(tbIcons, pTbIcons, false);
+                Win32.SendMessage(PluginBase.nppData._nppHandle, (uint)NppMsg.NPPM_ADDTOOLBARICON, PluginBase._funcItems.Items[idMyDlg]._cmdID, pTbIcons);
+                Marshal.FreeHGlobal(pTbIcons);
+            }
         }
 
         private static async void CheckUpdates(RegExToolDialog dialog)

CSharpRegexTools4Npp/PluginInfrastructure/Msgs_h.cs

@@ -172,6 +172,13 @@ public enum NppMsg : uint
         /// </summary>
         NPPM_ADDTOOLBARICON = Constants.NPPMSG + 41,
 
+        /// <summary>
+        /// void NPPM_ADDTOOLBARICON_FORDARKMODE(UINT funcItem[X]._cmdID, toolbarIconsWithDarkMode iconHandles)
+        /// Use NPPM_ADDTOOLBARICON_FORDARKMODE instead obsolete NPPM_ADDTOOLBARICON which doesn't support the dark mode
+        /// 2 formats / 3 icons are needed:  1 * BMP + 2 * ICO 
+        /// </summary>
+        NPPM_ADDTOOLBARICON_FORDARKMODE = Constants.NPPMSG + 101,
+
         /// <summary>
         ///winVer NPPM_GETWINDOWSVERSION(0, 0)
         /// </summary>

CSharpRegexTools4Npp/PluginInfrastructure/NotepadPPGateway.cs

@@ -1,6 +1,7 @@
 // NPP plugin platform for .Net v0.94.00 by Kasper B. Graversen etc.
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -217,6 +218,21 @@ public string NppBinDirectoryPath
             }
         }
 
+        public string NppBinVersion
+        {
+            get
+            {
+                try
+                {
+                    return FileVersionInfo.GetVersionInfo(Path.Combine(NppBinDirectoryPath, "notepad++.exe")).FileVersion;
+                }
+                catch
+                {
+                    return null;
+                }
+            }
+        }
+
         /// <summary>
         /// Gets the path of the current document.
         /// </summary>

CSharpRegexTools4Npp/PluginInfrastructure/NppPluginNETHelper.cs

@@ -183,28 +183,28 @@ public enum DockMgrMsg : uint
         IDC_BTN_CAPTION = 1050,
 
         DMM_MSG = 0x5000,
-        DMM_CLOSE = (DMM_MSG + 1),
-        DMM_DOCK = (DMM_MSG + 2),
-        DMM_FLOAT = (DMM_MSG + 3),
-        DMM_DOCKALL = (DMM_MSG + 4),
-        DMM_FLOATALL = (DMM_MSG + 5),
-        DMM_MOVE = (DMM_MSG + 6),
-        DMM_UPDATEDISPINFO = (DMM_MSG + 7),
-        DMM_GETIMAGELIST = (DMM_MSG + 8),
-        DMM_GETICONPOS = (DMM_MSG + 9),
-        DMM_DROPDATA = (DMM_MSG + 10),
-        DMM_MOVE_SPLITTER = (DMM_MSG + 11),
-        DMM_CANCEL_MOVE = (DMM_MSG + 12),
-        DMM_LBUTTONUP = (DMM_MSG + 13),
+        DMM_CLOSE = DMM_MSG + 1,
+        DMM_DOCK = DMM_MSG + 2,
+        DMM_FLOAT = DMM_MSG + 3,
+        DMM_DOCKALL = DMM_MSG + 4,
+        DMM_FLOATALL = DMM_MSG + 5,
+        DMM_MOVE = DMM_MSG + 6,
+        DMM_UPDATEDISPINFO = DMM_MSG + 7,
+        DMM_GETIMAGELIST = DMM_MSG + 8,
+        DMM_GETICONPOS = DMM_MSG + 9,
+        DMM_DROPDATA = DMM_MSG + 10,
+        DMM_MOVE_SPLITTER = DMM_MSG + 11,
+        DMM_CANCEL_MOVE = DMM_MSG + 12,
+        DMM_LBUTTONUP = DMM_MSG + 13,
 
         DMN_FIRST = 1050,
-        DMN_CLOSE = (DMN_FIRST + 1),
+        DMN_CLOSE = DMN_FIRST + 1,
         //nmhdr.Code = DWORD(DMN_CLOSE, 0));
         //nmhdr.hwndFrom = hwndNpp;
         //nmhdr.IdFrom = ctrlIdNpp;
 
-        DMN_DOCK = (DMN_FIRST + 2),
-        DMN_FLOAT = (DMN_FIRST + 3)
+        DMN_DOCK = DMN_FIRST + 2,
+        DMN_FLOAT = DMN_FIRST + 3
         //nmhdr.Code = DWORD(DMN_XXX, int newContainer);
         //nmhdr.hwndFrom = hwndNpp;
         //nmhdr.IdFrom = ctrlIdNpp;
@@ -216,4 +216,13 @@ public struct toolbarIcons
         public IntPtr hToolbarBmp;
         public IntPtr hToolbarIcon;
     }
+
+    // All 3 handles below should be set so the icon will be displayed correctly if toolbar icon sets are changed by users, also in dark mode
+    [StructLayout(LayoutKind.Sequential)]
+    public struct toolbarIconsWithDarkMode
+    {
+        public IntPtr hToolbarBmp;
+        public IntPtr hToolbarIcon;
+        public IntPtr hToolbarIconDarkMode;
+    }
 }

CSharpRegexTools4Npp/PluginInfrastructure/Preference_h.cs

@@ -4,10 +4,6 @@
 // "notepad-plus-plus/scintilla/include/Scintilla.iface"
 // found at
 // https://github.com/notepad-plus-plus/notepad-plus-plus/blob/master/scintilla/include/Scintilla.iface
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace NppPluginNET.PluginInfrastructure
 {