Wait to cache thumbnails after theme dialog finishes loading

t1m0thyj · May 6, 2020 · beafa44 · beafa44
1 parent fb71d7d
commit beafa44
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/src/ImportDialog.cs b/src/ImportDialog.cs
@@ -71,7 +71,11 @@ private void ImportNext()
             else
             {
                 ThemeManager.importMode = false;
-                this.Invoke(new Action(() => this.Close()));
+                this.Invoke(new Action(() =>
+                {
+                    label1.Text = _("Generating thumbnails, please wait...");
+                    this.Close();
+                }));
             }
         }
 

diff --git a/src/ThemeDialog.cs b/src/ThemeDialog.cs
@@ -211,6 +211,7 @@ private void LoadImportedThemes(List<ThemeConfig> themes, ImportDialog importDia
                     }));
                 }
 
+                ThemeThumbLoader.CacheThumbnails(imageListView1.Items);
                 importDialog.thumbnailsLoaded = true;
                 this.Invoke(new Action(() => importDialog.Close()));
             });
@@ -324,6 +325,8 @@ private void ThemeDialog_Load(object sender, EventArgs e)
                         imageListView1.EnsureVisible(focusItem.Index);
                     }));
                 }
+
+                ThemeThumbLoader.CacheThumbnails(imageListView1.Items);
             }));
         }
 

diff --git a/src/ThemeThumbLoader.cs b/src/ThemeThumbLoader.cs
@@ -15,6 +15,8 @@ namespace WinDynamicDesktop
 {
     class ThemeThumbLoader
     {
+        private static List<string> outdatedThemeIds = new List<string>();
+
         public static Size GetThumbnailSize(System.Windows.Forms.Control control)
         {
             int scaledWidth;
@@ -71,7 +73,6 @@ public static Image GetThumbnailImage(ThemeConfig theme, Size size, bool useCach
                     else
                     {
                         cachedImage.Dispose();
-                        File.Delete(thumbnailPath);
                     }
                 }
                 else if (ThemeManager.defaultThemes.Contains(theme.themeId))
@@ -96,10 +97,26 @@ public static Image GetThumbnailImage(ThemeConfig theme, Size size, bool useCach
                     g.DrawImage(bmp1, 0, 0, new Rectangle(0, 0, bmp1.Width / 2, bmp1.Height), GraphicsUnit.Pixel);
                 }
 
-                bmp2.Save(thumbnailPath, ImageFormat.Png);
-
+                outdatedThemeIds.Add(theme.themeId);
                 return bmp2;
             }
         }
+
+        public static void CacheThumbnails(Manina.Windows.Forms.ImageListView.ImageListViewItemCollection items)
+        {
+            foreach (Manina.Windows.Forms.ImageListViewItem item in items.Skip(1))
+            {
+                string themeId = (string)item.Tag;
+
+                if (outdatedThemeIds.Contains(themeId))
+                {
+                    ThemeConfig theme = ThemeManager.themeSettings.Find(t => t.themeId == themeId);
+                    string thumbnailPath = Path.Combine("themes", themeId, "thumbnail.png");
+
+                    item.ThumbnailImage.Save(thumbnailPath, ImageFormat.Png);
+                    outdatedThemeIds.Remove(themeId);
+                }
+            }
+        }
     }
 }