Fix dark mode ListView ColumnHeader bug where recreating ListView Handle doesn't apply DarkMode.

Author: KlausLoeffelmann

src/System.Windows.Forms/System/Windows/Forms/Controls/ListView/ListView.cs

@@ -627,6 +627,10 @@ protected override CreateParams CreateParams
     {
         get
         {
+#pragma warning disable WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+            SetStyle(ControlStyles.ApplyThemingImplicitly, true);
+#pragma warning restore WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+
             CreateParams cp = base.CreateParams;
 
             cp.ClassName = PInvoke.WC_LISTVIEW;
@@ -2553,6 +2557,8 @@ private int CompensateColumnHeaderResize(int columnIndex, bool columnResizeCance
 
     protected override unsafe void CreateHandle()
     {
+        base.CreateHandle();
+
         if (!RecreatingHandle)
         {
             using ThemingScope scope = new(Application.UseVisualStyles);
@@ -2563,8 +2569,6 @@ protected override unsafe void CreateHandle()
             });
         }
 
-        base.CreateHandle();
-
         if (BackgroundImage is not null)
         {
             SetBackgroundImage();
@@ -2582,7 +2586,7 @@ protected override unsafe void CreateHandle()
     /// </remarks>
     private unsafe void CustomDraw(ref Message m)
     {
-        bool dontmess = false;
+        bool lockReturnValue = false;
         bool itemDrawDefault = false;
 
         try
@@ -2678,7 +2682,7 @@ private unsafe void CustomDraw(ref Message m)
                     if (_viewStyle is View.Details or View.Tile)
                     {
                         m.ResultInternal = (LRESULT)(nint)(PInvoke.CDRF_NOTIFYSUBITEMDRAW | PInvoke.CDRF_NEWFONT);
-                        dontmess = true; // don't mess with our return value!
+                        lockReturnValue = true; // Let's make sure we're not changing this.
 
                         // ITEMPREPAINT is used to work out the rect for the first column!!! GAH!!!
                         // (which means we can't just do our color/font work on SUBITEM|ITEM_PREPAINT)
@@ -2760,7 +2764,7 @@ private unsafe void CustomDraw(ref Message m)
                     // get the node
                     ListViewItem item = Items[(int)nmcd->nmcd.dwItemSpec];
                     // if we're doing the whole row in one style, change our result!
-                    if (dontmess && item.UseItemStyleForSubItems)
+                    if (lockReturnValue && item.UseItemStyleForSubItems)
                     {
                         m.ResultInternal = (LRESULT)(nint)PInvoke.CDRF_NEWFONT;
                     }
@@ -2911,7 +2915,7 @@ private unsafe void CustomDraw(ref Message m)
                         PInvokeCore.SelectObject(nmcd->nmcd.hdc, _odCacheFontHandleWrapper.Handle);
                     }
 
-                    if (!dontmess)
+                    if (!lockReturnValue)
                     {
                         m.ResultInternal = (LRESULT)(nint)PInvoke.CDRF_NEWFONT;
                     }
@@ -4539,14 +4543,15 @@ protected override void OnHandleCreated(EventArgs e)
 
         UpdateExtendedStyles();
         RealizeProperties();
+
         PInvokeCore.SendMessage(this, PInvoke.LVM_SETBKCOLOR, (WPARAM)0, (LPARAM)BackColor);
         PInvokeCore.SendMessage(this, PInvoke.LVM_SETTEXTCOLOR, (WPARAM)0, (LPARAM)ForeColor);
 
         // The native list view will not invalidate the entire list view item area if the BkColor is not CLR_NONE.
         // This not noticeable if the customer paints the items w/ the same background color as the list view itself.
         // However, if the customer paints the items w/ a color different from the list view's back color
         // then when the user changes selection the native list view will not invalidate the entire list view item area.
-        PInvokeCore.SendMessage(this, PInvoke.LVM_SETTEXTBKCOLOR, (WPARAM)0, (LPARAM)PInvokeCore.CLR_NONE);
+        // PInvokeCore.SendMessage(this, PInvoke.LVM_SETTEXTBKCOLOR, (WPARAM)0, (LPARAM)PInvokeCore.CLR_NONE);
 
         // LVS_NOSCROLL does not work well when the list view is in View.Details or in View.List modes.
         // we have to set this style after the list view was created and before we position the native list view items.
@@ -4590,18 +4595,22 @@ protected override void OnHandleCreated(EventArgs e)
 
         // Use a copy of the list items array so that we can maintain the (handle created || listItemsArray is not null) invariant
         ListViewItem[]? listViewItemsToAdd = null;
+
         if (_listViewItems is not null)
         {
             listViewItemsToAdd = [.. _listViewItems];
             _listViewItems = null;
         }
 
-        int columnCount = _columnHeaders is null ? 0 : _columnHeaders.Length;
+        int columnCount = _columnHeaders is null
+            ? 0
+            : _columnHeaders.Length;
 
         if (columnCount > 0)
         {
             int[] indices = new int[columnCount];
             int index = 0;
+
             foreach (ColumnHeader column in _columnHeaders!)
             {
                 indices[index] = column.DisplayIndex;
@@ -4655,16 +4664,16 @@ protected override void OnHandleCreated(EventArgs e)
             }
         }
 
-        if (!RecreatingHandle)
-        {
-            ApplyDarkModeOnDemand();
-        }
+        // We need to wait for the next message loop
+        // to apply dark mode on demand.
+        BeginInvoke(ApplyDarkModeOnDemand);
     }
 
 #pragma warning disable WFO5001
     private void ApplyDarkModeOnDemand()
     {
-        if (Application.IsDarkModeEnabled)
+        if (Application.IsDarkModeEnabled
+            && GetStyle(ControlStyles.ApplyThemingImplicitly))
         {
             // Enable double buffering when in dark mode to reduce flicker.
             uint exMask = PInvoke.LVS_EX_ONECLICKACTIVATE | PInvoke.LVS_EX_TWOCLICKACTIVATE |
@@ -4689,10 +4698,17 @@ private void ApplyDarkModeOnDemand()
                 null);
 
             // Get the ListView's ColumnHeader handle:
-            HWND columnHeaderHandle = (HWND)PInvokeCore.SendMessage(this, PInvoke.LVM_GETHEADER, (WPARAM)0, (LPARAM)0);
+            HWND columnHeaderHandle = (HWND)PInvokeCore.SendMessage(
+                this,
+                PInvoke.LVM_GETHEADER,
+                (WPARAM)0,
+                (LPARAM)0);
 
             // Apply dark mode theme to the ColumnHeader
-            PInvoke.SetWindowTheme(columnHeaderHandle, $"{DarkModeIdentifier}_{ItemsViewThemeIdentifier}", null);
+            PInvoke.SetWindowTheme(
+                columnHeaderHandle,
+                $"{DarkModeIdentifier}_{ItemsViewThemeIdentifier}",
+                null);
         }
     }
 #pragma warning restore WFO5001
@@ -4971,11 +4987,9 @@ private void RealizeAllSubItems()
 
     protected void RealizeProperties()
     {
-        // Realize state information
-        Color c;
-
-        c = BackColor;
 #pragma warning disable WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+        Color c = BackColor;
+
         if (c != SystemColors.Window || Application.IsDarkModeEnabled)
         {
             PInvokeCore.SendMessage(this, PInvoke.LVM_SETBKCOLOR, (WPARAM)0, (LPARAM)c);
@@ -4989,6 +5003,7 @@ protected void RealizeProperties()
         }
 #pragma warning restore WFO5001
 
+        // Realize state information
         if (_imageListLarge is not null)
         {
             PInvokeCore.SendMessage(this, PInvoke.LVM_SETIMAGELIST, (WPARAM)PInvoke.LVSIL_NORMAL, (LPARAM)_imageListLarge.Handle);
@@ -6441,16 +6456,16 @@ private int UpdateGroupCollapse(MessageId clickType)
 
     internal void RecreateHandleInternal()
     {
-        // For some reason, if CheckBoxes are set to true and the list view has a state imageList, then the native
-        // listView destroys the state imageList.
-        // (Yes, it does exactly that even though our wrapper sets LVS_SHAREIMAGELISTS on the native listView.)
+        // For some reason, if CheckBoxes are set to true and the list view has a state imageList,
+        // then the native listView destroys the state imageList.
+        // (Yes, it does exactly that even though our wrapper sets LVS_SHAREIMAGELISTS
+        // on the native listView.)
         if (IsHandleCreated && StateImageList is not null)
         {
             PInvokeCore.SendMessage(this, PInvoke.LVM_SETIMAGELIST, (WPARAM)PInvoke.LVSIL_STATE);
         }
 
         RecreateHandle();
-        ApplyDarkModeOnDemand();
     }
 
     private unsafe void WmReflectNotify(ref Message m)