Improve appearance of ListView in theme dialog

t1m0thyj · Mar 5, 2019 · c14a46f · c14a46f
1 parent fdea4df
commit c14a46f
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/src/ThemeDialog.cs b/src/ThemeDialog.cs
@@ -9,6 +9,7 @@
 using System.Windows.Forms;
 using System.Collections;
 using System.IO;
+using System.Runtime.InteropServices;
 
 namespace WinDynamicDesktop
 {
@@ -31,13 +32,6 @@ public ThemeDialog()
 
             this.Font = SystemFonts.MessageBoxFont;
             this.FormClosing += OnFormClosing;
-
-            int bestWidth = (GetThumbnailSize(false).Width +
-                SystemInformation.IconHorizontalSpacing) * 2;
-            int oldWidth = this.listView1.Size.Width;
-            this.listView1.Size = new Size(bestWidth, this.listView1.Height);
-            this.Size = new Size(this.Width + bestWidth - oldWidth, this.Height);
-            this.CenterToScreen();
         }
 
         public void ImportThemes(List<string> themePaths)
@@ -271,10 +265,15 @@ private void LoadImportedThemes(List<ThemeConfig> themes)
             }
         }
 
+        // Code to change ListView appearance from https://stackoverflow.com/a/4463114/5504760
+        [DllImport("uxtheme.dll", ExactSpelling = true, CharSet = CharSet.Unicode)]
+        private static extern int SetWindowTheme(IntPtr hwnd, string pszSubAppName, string pszSubIdList);
+
         private void ThemeDialog_Load(object sender, EventArgs e)
         {
             listView1.ContextMenuStrip = contextMenuStrip1;
             listView1.ListViewItemSorter = new CompareByItemText(listView1);
+            SetWindowTheme(this.listView1.Handle, "Explorer", null);
 
             darkModeCheckbox.Checked = JsonConfig.settings.darkMode;
             applyButton.Enabled = LocationManager.isReady;
@@ -317,6 +316,14 @@ private void ThemeDialog_Load(object sender, EventArgs e)
             }
 
             listView1.Sort();
+
+            int numCols = (thumbnailSize.Width < 256) ? 2 : 3;
+            int bestWidth = (listView1.GetItemRect(0).Width + 4) * numCols +
+                SystemInformation.VerticalScrollBarWidth;
+            int oldWidth = this.listView1.Size.Width;
+            this.listView1.Size = new Size(bestWidth, this.listView1.Height);
+            this.Size = new Size(this.Width + bestWidth - oldWidth, this.Height);
+            this.CenterToScreen();
         }
 
         private void listView1_SelectedIndexChanged(object sender, EventArgs e)