Merge branch 'master' into apply_dark_mode_to_arbitrary_controls

Author: molsonkiko

Demo Plugin/NppManagedPluginDemo/Demo.cs

@@ -144,6 +144,8 @@ static internal void CommandMenuInit()
             PluginBase.SetCommand(16, "---", null);
 
             PluginBase.SetCommand(17, "Print Scroll and Row Information", PrintScrollInformation);
+            
+            PluginBase.SetCommand(18, "Use NanInf class for -inf, inf, nan!!", PrintNanInf);
         }
 
         /// <summary>
@@ -550,6 +552,21 @@ static void DockableDlgDemo()
             ToggleDarkMode(frmGoToLine, notepad.IsDarkModeEnabled());
             frmGoToLine.textBox1.Focus();
         }
+
+        static void PrintNanInf()
+        {
+            bool neginf_correct = double.IsNegativeInfinity(NanInf.neginf);
+            bool inf_correct = double.IsPositiveInfinity(NanInf.inf);
+            bool nan_correct = double.IsNaN(NanInf.nan);
+            string naninf = $@"-infinity == NanInf.neginf: {neginf_correct}
+infinity == NanInf.inf: {inf_correct}
+NaN == NanInf.nan: {nan_correct}
+If you want these constants in your plugin, you can find them in the NanInf class in PluginInfrastructure.
+DO NOT USE double.PositiveInfinity, double.NegativeInfinity, or double.NaN.
+You will get a compiler error if you do.";
+            notepad.FileNew();
+            editor.AppendTextAndMoveCursor(naninf);
+        }
         #endregion
     }
 }   

Demo Plugin/NppManagedPluginDemo/NppManagedPluginDemo.csproj

@@ -123,6 +123,9 @@
     <Compile Include="Forms\DarkModeTestForm.Designer.cs">
       <DependentUpon>DarkModeTestForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="..\..\Visual Studio Project Template C#\PluginInfrastructure\NanInf.cs">
+      <Link>PluginInfrastructure\NanInf.cs</Link>
+    </Compile>
     <Compile Include="Forms\frmGoToLine.cs">
       <SubType>Form</SubType>
     </Compile>

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#/PluginInfrastructure/NanInf.cs

@@ -0,0 +1,28 @@
+namespace Kbg.NppPluginNET.PluginInfrastructure
+{
+    /// <summary>
+    /// holds NaN, Infinity, and -Infinity as things generated at runtime<br></br>
+    /// because the compiler freaks out if it sees any of<br></br>
+    /// double.NegativeInfinity, double.PositiveInfinity, or double.NaN<br></br>
+    /// or any statically analyzed function of two constants that makes one of those constants<br></br>
+    /// like 1d/0d, 0d/0d, or -1d/0d.
+    /// </summary>
+    public class NanInf
+    {
+        /// <summary>
+        /// a/b<br></br>
+        /// may be necessary to generate infinity or nan at runtime
+        /// to avoid the compiler pre-computing things<br></br>
+        /// since if the compiler sees literal 1d/0d in the code
+        /// it just pre-computes it at compile time
+        /// </summary>
+        /// <param name="a"></param>
+        /// <param name="b"></param>
+        /// <returns></returns>
+        public static double Divide(double a, double b) { return a / b; }
+
+        public static readonly double inf = Divide(1d, 0d);
+        public static readonly double neginf = Divide(-1d, 0d);
+        public static readonly double nan = Divide(0d, 0d);
+    }
+}

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>