shibayan · shibayan · Jul 30, 2020 · Jul 30, 2020
diff --git a/WinQuickLook/Handlers/AnimatedGifPreviewHandler.cs b/WinQuickLook/Handlers/AnimatedGifPreviewHandler.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media.Imaging;
@@ -24,7 +25,7 @@ public bool CanOpen(string fileName)
             return bitmap.Frames.Count > 1;
         }
 
-        public (FrameworkElement, Size, string) GetViewer(string fileName)
+        public async Task<(FrameworkElement, Size, string)> GetViewerAsync(string fileName)
         {
             var bitmap = BitmapDecoder.Create(new Uri(fileName), BitmapCreateOptions.DelayCreation, BitmapCacheOption.OnDemand);
 

diff --git a/WinQuickLook/Handlers/AudioPreviewHandler.cs b/WinQuickLook/Handlers/AudioPreviewHandler.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading.Tasks;
 using System.Windows;
 
 using WinQuickLook.Controls;
@@ -17,7 +18,7 @@ public bool CanOpen(string fileName)
             return _supportFormats.Contains(extension);
         }
 
-        public (FrameworkElement, Size, string) GetViewer(string fileName)
+        public async Task<(FrameworkElement, Size, string)> GetViewerAsync(string fileName)
         {
             var requestSize = new Size(400, 400);
 

diff --git a/WinQuickLook/Handlers/ComInteropPreviewHandler.cs b/WinQuickLook/Handlers/ComInteropPreviewHandler.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Forms.Integration;
 
@@ -20,7 +21,7 @@ public bool CanOpen(string fileName)
             return PreviewHandlerHost.GetPreviewHandlerCLSID(fileName) != Guid.Empty;
         }
 
-        public (FrameworkElement, Size, string) GetViewer(string fileName)
+        public async Task<(FrameworkElement, Size, string)> GetViewerAsync(string fileName)
         {
             var requestSize = new Size
             {

diff --git a/WinQuickLook/Handlers/GenericPreviewHandler.cs b/WinQuickLook/Handlers/GenericPreviewHandler.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using System.Threading.Tasks;
 using System.Windows;
 
 using WinQuickLook.Controls;
@@ -13,7 +14,7 @@ public bool CanOpen(string fileName)
             return true;
         }
 
-        public (FrameworkElement, Size, string) GetViewer(string fileName)
+        public async Task<(FrameworkElement, Size, string)> GetViewerAsync(string fileName)
         {
             var requestSize = new Size(500, 280);
 

diff --git a/WinQuickLook/Handlers/HtmlPreviewHandler.cs b/WinQuickLook/Handlers/HtmlPreviewHandler.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -17,7 +18,7 @@ public bool CanOpen(string fileName)
             return _supportFormats.Contains(extension);
         }
 
-        public (FrameworkElement, Size, string) GetViewer(string fileName)
+        public async Task<(FrameworkElement, Size, string)> GetViewerAsync(string fileName)
         {
             var requestSize = new Size
             {

diff --git a/WinQuickLook/Handlers/IPreviewHandler.cs b/WinQuickLook/Handlers/IPreviewHandler.cs
@@ -1,11 +1,12 @@
-using System.Windows;
+using System.Threading.Tasks;
+using System.Windows;
 
 namespace WinQuickLook.Handlers
 {
     public interface IPreviewHandler
     {
         bool CanOpen(string fileName);
 
-        (FrameworkElement, Size, string) GetViewer(string fileName);
+        Task<(FrameworkElement, Size, string)> GetViewerAsync(string fileName);
     }
 }
diff --git a/WinQuickLook/Handlers/ImagePreviewHandler.cs b/WinQuickLook/Handlers/ImagePreviewHandler.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
@@ -22,7 +23,7 @@ public bool CanOpen(string fileName)
             {
                 using var stream = File.OpenRead(fileName);
 
-                BitmapDecoder.Create(stream, BitmapCreateOptions.DelayCreation, BitmapCacheOption.OnDemand);
+                BitmapDecoder.Create(stream, BitmapCreateOptions.DelayCreation, BitmapCacheOption.None);
 
                 return true;
             }
@@ -32,9 +33,9 @@ public bool CanOpen(string fileName)
             }
         }
 
-        public (FrameworkElement, Size, string) GetViewer(string fileName)
+        public async Task<(FrameworkElement, Size, string)> GetViewerAsync(string fileName)
         {
-            var bitmap = GetImage(fileName);
+            var (bitmap, originalSize) = GetImage(fileName);
 
             var requestSize = new Size
             {
@@ -46,36 +47,51 @@ public bool CanOpen(string fileName)
 
             image.BeginInit();
             image.Stretch = Stretch.Uniform;
-            image.StretchDirection = StretchDirection.DownOnly;
+            image.StretchDirection = StretchDirection.Both;
             image.Source = bitmap;
             image.EndInit();
 
-            return (image, requestSize, $"{bitmap.PixelWidth}x{bitmap.PixelHeight} - {WinExplorerHelper.GetFileSize(fileName)}");
+            return (image, requestSize, $"{originalSize.Width}x{originalSize.Height} - {WinExplorerHelper.GetFileSize(fileName)}");
         }
 
-        private static BitmapSource GetImage(string fileName)
+        private static (BitmapSource, Size) GetImage(string fileName)
         {
+            var (scaledSize, originalSize) = GetScaledImageSize(fileName, 1200);
+
             var bitmap = new BitmapImage();
 
             bitmap.BeginInit();
-            bitmap.CacheOption = BitmapCacheOption.OnLoad;
             bitmap.CreateOptions = BitmapCreateOptions.None;
+            bitmap.CacheOption = BitmapCacheOption.None;
+            bitmap.DecodePixelWidth = (int)scaledSize.Width;
+            bitmap.DecodePixelHeight = (int)scaledSize.Height;
             bitmap.UriSource = new Uri(fileName, UriKind.Absolute);
             bitmap.EndInit();
 
             bitmap.Freeze();
 
-            if (Math.Abs(bitmap.DpiX - 96.0) < 0.1 && Math.Abs(bitmap.DpiY - 96.0) < 0.1)
-            {
-                return bitmap;
-            }
+            return (bitmap, originalSize);
+        }
+
+        private static (Size, Size) GetScaledImageSize(string fileName, int maxSize)
+        {
+            using var stream = File.OpenRead(fileName);
 
-            int stride = bitmap.PixelWidth * 4;
-            var pixels = new byte[stride * bitmap.PixelHeight];
+            var decoder = BitmapDecoder.Create(stream, BitmapCreateOptions.DelayCreation, BitmapCacheOption.None);
 
-            bitmap.CopyPixels(pixels, stride, 0);
+            var width = decoder.Frames[0].PixelWidth;
+            var height = decoder.Frames[0].PixelHeight;
+
+            var originalSize = new Size(width, height);
+
+            if (width > maxSize || height > maxSize)
+            {
+                var scaleFactor = (double)maxSize / Math.Max(width, height);
+
+                return (new Size(width * scaleFactor, height * scaleFactor), originalSize);
+            }
 
-            return BitmapSource.Create(bitmap.PixelWidth, bitmap.PixelHeight, 96.0, 96.0, bitmap.Format, bitmap.Palette, pixels, stride);
+            return (originalSize, originalSize);
         }
     }
 }
diff --git a/WinQuickLook/Handlers/InternetShortcutPreviewHandler.cs b/WinQuickLook/Handlers/InternetShortcutPreviewHandler.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -15,7 +16,7 @@ public bool CanOpen(string fileName)
             return _supportFormats.Contains(extension);
         }
 
-        public (FrameworkElement, Size, string) GetViewer(string fileName)
+        public async Task<(FrameworkElement, Size, string)> GetViewerAsync(string fileName)
         {
             var content = File.ReadAllLines(fileName);
 

diff --git a/WinQuickLook/Handlers/PdfPreviewHandler.cs b/WinQuickLook/Handlers/PdfPreviewHandler.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Forms.Integration;
 
@@ -18,7 +19,7 @@ public bool CanOpen(string fileName)
             return extension == ".pdf";
         }
 
-        public (FrameworkElement, Size, string) GetViewer(string fileName)
+        public async Task<(FrameworkElement, Size, string)> GetViewerAsync(string fileName)
         {
             var pdfViewer = new PdfViewer();
 

diff --git a/WinQuickLook/Handlers/SyntaxHighlightPreviewHandler.cs b/WinQuickLook/Handlers/SyntaxHighlightPreviewHandler.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media;
 
@@ -26,7 +27,7 @@ public bool CanOpen(string fileName)
             return HighlightingManager.Instance.GetDefinitionByExtension(Path.GetExtension(fileName)) != null;
         }
 
-        public (FrameworkElement, Size, string) GetViewer(string fileName)
+        public async Task<(FrameworkElement, Size, string)> GetViewerAsync(string fileName)
         {
             var requestSize = new Size
             {

diff --git a/WinQuickLook/Handlers/TextPreviewHandler.cs b/WinQuickLook/Handlers/TextPreviewHandler.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
@@ -21,7 +22,7 @@ public bool CanOpen(string fileName)
             return _supportFormats.Contains(extension);
         }
 
-        public (FrameworkElement, Size, string) GetViewer(string fileName)
+        public async Task<(FrameworkElement, Size, string)> GetViewerAsync(string fileName)
         {
             var contents = File.ReadAllBytes(fileName);
             var encoding = DetectEncoding(contents);

diff --git a/WinQuickLook/Handlers/VideoPreviewHandler.cs b/WinQuickLook/Handlers/VideoPreviewHandler.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading.Tasks;
 using System.Windows;
 
 using WinQuickLook.Controls;
@@ -17,7 +18,7 @@ public bool CanOpen(string fileName)
             return _supportFormats.Contains(extension);
         }
 
-        public (FrameworkElement, Size, string) GetViewer(string fileName)
+        public async Task<(FrameworkElement, Size, string)> GetViewerAsync(string fileName)
         {
             var requestSize = new Size
             {

diff --git a/WinQuickLook/QuickLookWindow.xaml.cs b/WinQuickLook/QuickLookWindow.xaml.cs
@@ -71,14 +71,14 @@ public bool HideIfVisible()
             return true;
         }
 
-        public void Open(string fileName)
+        public async void Open(string fileName)
         {
             CleanupHost();
 
             _fileName = fileName;
             _handler = _handlers.First(x => x.CanOpen(fileName));
 
-            var (element, requestSize, metadata) = _handler.GetViewer(fileName);
+            var (element, requestSize, metadata) = await _handler.GetViewerAsync(fileName);
 
             PreviewHost = element;