Merge pull request #108 from BdR76/master

Support for Fluent UI icons in template

Author: kbilsted

Visual Studio Project Template C#/Main.cs

@@ -16,8 +16,11 @@ class Main
         static bool someSetting = false;
         static frmMyDlg frmMyDlg = null;
         static int idMyDlg = -1;
-        static Bitmap tbBmp = Properties.Resources.star;
-        static Bitmap tbBmp_tbTab = Properties.Resources.star_bmp;
+
+        // toolbar icons
+        static Bitmap tbBmp_color = Properties.Resources.star;     // standard icon small color
+        static Icon tbIco_black = Properties.Resources.star_black; // Fluent UI icon black
+        static Icon tbIco_white = Properties.Resources.star_white; // Fluent UI icon white
         static Icon tbIcon = null;
 
         public static void OnNotification(ScNotification notification)
@@ -47,14 +50,25 @@ internal static void CommandMenuInit()
 
         internal static void SetToolBarIcon()
         {
+            // create struct
             toolbarIcons tbIcons = new toolbarIcons();
-            tbIcons.hToolbarBmp = tbBmp.GetHbitmap();
+
+            // add bmp icon
+            tbIcons.hToolbarBmp = tbBmp_color.GetHbitmap();
+            tbIcons.hToolbarIcon = tbIco_black.Handle;            // icon with black lines
+            tbIcons.hToolbarIconDarkMode = tbIco_white.Handle;  // icon with light grey lines
+
+            // convert to c++ pointer
             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);
+
+            // call Notepad++ api
+            Win32.SendMessage(PluginBase.nppData._nppHandle, (uint)NppMsg.NPPM_ADDTOOLBARICON_FORDARKMODE, PluginBase._funcItems.Items[idMyDlg]._cmdID, pTbIcons);
+
+            // release pointer
             Marshal.FreeHGlobal(pTbIcons);
         }
-
+		
         internal static void PluginCleanUp()
         {
             Win32.WritePrivateProfileString("SomeSection", "SomeKey", someSetting ? "1" : "0", iniFilePath);
@@ -70,8 +84,10 @@ internal static void myDockableDialog()
         {
             if (frmMyDlg == null)
             {
+                // show dialog for first time
                 frmMyDlg = new frmMyDlg();
 
+                // icon
                 using (Bitmap newBmp = new Bitmap(16, 16))
                 {
                     Graphics g = Graphics.FromImage(newBmp);
@@ -81,17 +97,21 @@ internal static void myDockableDialog()
                     colorMap[0].NewColor = Color.FromKnownColor(KnownColor.ButtonFace);
                     ImageAttributes attr = new ImageAttributes();
                     attr.SetRemapTable(colorMap);
-                    g.DrawImage(tbBmp_tbTab, new Rectangle(0, 0, 16, 16), 0, 0, 16, 16, GraphicsUnit.Pixel, attr);
+                    g.DrawImage(tbBmp_color, new Rectangle(0, 0, 16, 16), 0, 0, 16, 16, GraphicsUnit.Pixel, attr);
                     tbIcon = Icon.FromHandle(newBmp.GetHicon());
                 }
 
-                NppTbData _nppTbData = new NppTbData();
-                _nppTbData.hClient = frmMyDlg.Handle;
-                _nppTbData.pszName = "My dockable dialog";
-                _nppTbData.dlgID = idMyDlg;
-                _nppTbData.uMask = NppTbMsg.DWS_DF_CONT_RIGHT | NppTbMsg.DWS_ICONTAB | NppTbMsg.DWS_ICONBAR;
-                _nppTbData.hIconTab = (uint)tbIcon.Handle;
-                _nppTbData.pszModuleName = PluginName;
+                // dockable window struct data
+                var _nppTbData = new NppTbData
+                {
+                    hClient = frmMyDlg.Handle,
+                    pszName = "My dockable dialog",
+                    dlgID = idMyDlg,
+                    uMask = NppTbMsg.DWS_DF_CONT_RIGHT | NppTbMsg.DWS_ICONTAB | NppTbMsg.DWS_ICONBAR,
+                    hIconTab = (uint)tbIcon.Handle,
+                    pszModuleName = PluginName
+                };
+
                 IntPtr _ptrNppTbData = Marshal.AllocHGlobal(Marshal.SizeOf(_nppTbData));
                 Marshal.StructureToPtr(_nppTbData, _ptrNppTbData, false);
 

Visual Studio Project Template C#/NppPlugin.vstemplate

@@ -32,6 +32,8 @@
         <ProjectItem ReplaceParameters="false" TargetFileName="Resources.resx">Resources.resx</ProjectItem>
         <ProjectItem ReplaceParameters="false" TargetFileName="star.png">star.png</ProjectItem>
         <ProjectItem ReplaceParameters="false" TargetFileName="star_bmp.bmp">star_bmp.bmp</ProjectItem>
+        <ProjectItem ReplaceParameters="false" TargetFileName="star_black.ico">star_black.ico</ProjectItem>
+        <ProjectItem ReplaceParameters="false" TargetFileName="star_white.ico">star_white.ico</ProjectItem>
       </Folder>
       <Folder Name="PluginInfrastructure" TargetFolderName="PluginInfrastructure">
           <Folder Name="DllExport" TargetFolderName="DllExport">

Visual Studio Project Template C#/Properties/Resources.Designer.cs

@@ -124,4 +124,10 @@
   <data name="star_bmp" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>star_bmp.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="star_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>star_black.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="star_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>star_white.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>