Set DefaultBackgroundColor to match dark/light theme settings.

Fix mixed line endings.

Author: mooflu

QuickLook.Plugin.WebViewPlus.csproj

@@ -72,6 +72,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>

WebpagePanel.cs

@@ -2,6 +2,7 @@
 
 using System;
 using System.Diagnostics;
+using System.Drawing;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -81,7 +82,10 @@ public WebpagePanel()
                         // See "Process model for WebView2 apps"
                         UserDataFolder = Path.Combine(SettingHelper.LocalDataPath, @"WebViewPlus_Data\\"),
                         Language = CultureInfo.CurrentUICulture.Name
-                    }
+                    },
+                    // Match background color in theme.tsx in WebViewPlus
+                    // Note: this will not adjust if dark/light is swapped via the in-app yingyang toggle
+                    DefaultBackgroundColor = OSThemeHelper.AppsUseDarkTheme() ? Color.FromArgb(0x21, 0x21, 0x21) : Color.FromArgb(0xee, 0xee, 0xee),
                 };
                 _webView.NavigationStarting += NavigationStarting_CancelNavigation;
                 _webView.CoreWebView2InitializationCompleted += CoreWebView2InitializationCompleted;
@@ -151,25 +155,25 @@ void sendFileData()
             {
                 _sharedBuffer = WebViewEnvironment.CreateSharedBuffer((ulong)_activeFileInfo.Length);
                 using (BinaryWriter writer = new BinaryWriter(_sharedBuffer.OpenStream()))
-                {
-                    using (var br = new BinaryReader(new FileStream(_activeFileInfo.FullName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)))
-                    {
-                        writer.Write(br.ReadBytes((int)br.BaseStream.Length));
-                    }
+                {
+                    using (var br = new BinaryReader(new FileStream(_activeFileInfo.FullName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)))
+                    {
+                        writer.Write(br.ReadBytes((int)br.BaseStream.Length));
+                    }
                 }
             }
             else
             {
-                _sharedBuffer = WebViewEnvironment.CreateSharedBuffer(1);
-
-                var encoding = Encoding.UTF8;
-                if (DetectEncoding)
-                {
-                    encoding = CharsetDetector.DetectFromFile(_activeFileInfo).Detected?.Encoding ?? encoding;
-                }
-                using (var sr = new StreamReader(new FileStream(_activeFileInfo.FullName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite), encoding))
-                {
-                    textContent = sr.ReadToEnd();
+                _sharedBuffer = WebViewEnvironment.CreateSharedBuffer(1);
+
+                var encoding = Encoding.UTF8;
+                if (DetectEncoding)
+                {
+                    encoding = CharsetDetector.DetectFromFile(_activeFileInfo).Detected?.Encoding ?? encoding;
+                }
+                using (var sr = new StreamReader(new FileStream(_activeFileInfo.FullName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite), encoding))
+                {
+                    textContent = sr.ReadToEnd();
                 }
             }
             var json = JsonConvert.SerializeObject(
@@ -193,19 +197,19 @@ void WebMessageReceived(object sender, CoreWebView2WebMessageReceivedEventArgs a
             switch(msg.command)
             {
                 case "AppReadyForData":
-                    _webAppReady = true;
-                    // If the user profile was previously generated (WebView2_Data), it doesn't seem to change the navigator.language setting
-                    // when a webview is created with a different language in 'new WebView2' above.
-                    // You'd have to delete the WebView2_Data folder first.
-                    // Oh, well. Explicitly sending current language to web app, instead.
-                    var json = JsonConvert.SerializeObject(
-                        new InitData
-                        {
-                            langCode = CultureInfo.CurrentUICulture.Name,
-                            detectEncoding = SettingHelper.Get("DetectEncoding", false, "QuickLook.Plugin.WebViewPlus"),
-                            showTrayIcon = SettingHelper.Get("ShowTrayIcon", true),
-                            useTransparency = SettingHelper.Get("UseTransparency", true)
-                        }
+                    _webAppReady = true;
+                    // If the user profile was previously generated (WebView2_Data), it doesn't seem to change the navigator.language setting
+                    // when a webview is created with a different language in 'new WebView2' above.
+                    // You'd have to delete the WebView2_Data folder first.
+                    // Oh, well. Explicitly sending current language to web app, instead.
+                    var json = JsonConvert.SerializeObject(
+                        new InitData
+                        {
+                            langCode = CultureInfo.CurrentUICulture.Name,
+                            detectEncoding = SettingHelper.Get("DetectEncoding", false, "QuickLook.Plugin.WebViewPlus"),
+                            showTrayIcon = SettingHelper.Get("ShowTrayIcon", true),
+                            useTransparency = SettingHelper.Get("UseTransparency", true)
+                        }
                     );
 
                     _webView.CoreWebView2.PostWebMessageAsString($"initData:{json}");
@@ -227,28 +231,28 @@ void WebMessageReceived(object sender, CoreWebView2WebMessageReceivedEventArgs a
                     break;
 
                 case "UseTransparency":
-                    SettingHelper.Set("UseTransparency", msg.boolValue);
+                    SettingHelper.Set("UseTransparency", msg.boolValue);
                     break;
 
                 case "Restart":
-                    RestartQuicklook();
+                    RestartQuicklook();
                     break;
 
                 default:
                     break;
             }
         }
 
-        private void RestartQuicklook()
-        {
-            // Restart QL. Clunky way to delay startup to pass already running check.
-            ProcessStartInfo Info = new ProcessStartInfo();
-            Info.Arguments = "/C ping 127.0.0.1 -n 2 && \"" + string.Join(" ", Environment.GetCommandLineArgs()) + "\"";
-            Info.WindowStyle = ProcessWindowStyle.Hidden;
-            Info.CreateNoWindow = true;
-            Info.FileName = "cmd.exe";
-            Process.Start(Info);
-            Process.GetCurrentProcess().Kill();
+        private void RestartQuicklook()
+        {
+            // Restart QL. Clunky way to delay startup to pass already running check.
+            ProcessStartInfo Info = new ProcessStartInfo();
+            Info.Arguments = "/C ping 127.0.0.1 -n 2 && \"" + string.Join(" ", Environment.GetCommandLineArgs()) + "\"";
+            Info.WindowStyle = ProcessWindowStyle.Hidden;
+            Info.CreateNoWindow = true;
+            Info.FileName = "cmd.exe";
+            Process.Start(Info);
+            Process.GetCurrentProcess().Kill();
         }
 
         private void CoreWebView2InitializationCompleted(object sender, EventArgs e)
@@ -314,10 +318,10 @@ private void FrameNavigationStarting(object sender, CoreWebView2NavigationStarti
                     _webView.CoreWebView2.PostWebMessageAsString("frameNavigationRejected");
                 }
             }
-        }
-
-        // No longer used - Changes in webview2 caused crashes due to
-        // "WebView2 controller will be auto closed if the parent hwnd is destroyed"
+        }
+
+        // No longer used - Changes in webview2 caused crashes due to
+        // "WebView2 controller will be auto closed if the parent hwnd is destroyed"
         public void UnloadData() 
         {
             _activeFileInfo = null;
@@ -331,22 +335,22 @@ public void UnloadData()
 
         public void Dispose()
         {
-            if (firstPreview)
-            {
-                firstPreview = false;
-                _webView.CoreWebView2.Profile.ClearBrowsingDataAsync(
-                    CoreWebView2BrowsingDataKinds.FileSystems |
-                    CoreWebView2BrowsingDataKinds.IndexedDb |
-                    // keep local storage
-                    CoreWebView2BrowsingDataKinds.WebSql |
-                    CoreWebView2BrowsingDataKinds.CacheStorage |
-                    CoreWebView2BrowsingDataKinds.Cookies |
-                    CoreWebView2BrowsingDataKinds.DiskCache |
-                    CoreWebView2BrowsingDataKinds.DownloadHistory |
-                    CoreWebView2BrowsingDataKinds.GeneralAutofill |
-                    CoreWebView2BrowsingDataKinds.PasswordAutosave |
-                    CoreWebView2BrowsingDataKinds.Settings
-                );
+            if (firstPreview)
+            {
+                firstPreview = false;
+                _webView.CoreWebView2.Profile.ClearBrowsingDataAsync(
+                    CoreWebView2BrowsingDataKinds.FileSystems |
+                    CoreWebView2BrowsingDataKinds.IndexedDb |
+                    // keep local storage
+                    CoreWebView2BrowsingDataKinds.WebSql |
+                    CoreWebView2BrowsingDataKinds.CacheStorage |
+                    CoreWebView2BrowsingDataKinds.Cookies |
+                    CoreWebView2BrowsingDataKinds.DiskCache |
+                    CoreWebView2BrowsingDataKinds.DownloadHistory |
+                    CoreWebView2BrowsingDataKinds.GeneralAutofill |
+                    CoreWebView2BrowsingDataKinds.PasswordAutosave |
+                    CoreWebView2BrowsingDataKinds.Settings
+                );
             }
 
             _activeFileInfo = null;