Use reflection to call ShowBalloonTip to avoid JIT compilation errors

Co-authored-by: emako <24737061+emako@users.noreply.github.com>

CHANGELOG.md

@@ -1,3 +1,12 @@
+## 4.2.2
+
+- Fix version display issue [#1776](https://github.com/QL-Win/QuickLook/issues/1776)
+
+## 4.2.1
+
+- Fix theme error in MediaInfoViewer plugin [#1775](https://github.com/QL-Win/QuickLook/issues/1775)
+- Fix theme error in any theme-changable plugin [#1507](https://github.com/QL-Win/QuickLook/issues/1507)
+
 ## 4.2.0
 
 - Add built-in MediaInfoViewer plugin and support it in more menu

QuickLook.Native/QuickLook.Native32/Shell32.cpp

@@ -169,7 +169,7 @@ void Shell32::getSelectedFromDesktop(PWCHAR buffer)
         &pwba))))
         return;
 
-    if (HelperMethods::IsCursorActivated(reinterpret_cast<HWND>(LongToHandle(phwnd))))
+    if (HelperMethods::IsCursorActivated(0))
         return;
 
     CComPtr<IServiceProvider> psp;

QuickLook.Plugin/QuickLook.Plugin.ImageViewer/Webview/Svg/SvgImagePanel.cs

@@ -186,24 +186,13 @@ public class SvgImagePanel : WebpagePanel, IWebImagePanel
         return reader.ReadToEnd();
     }
 
-    public static class MimeTypes
+    public new static class MimeTypes
     {
-        public const string Html = "text/html";
-        public const string JavaScript = "application/javascript";
-        public const string Json = "application/json";
-        public const string Css = "text/css";
-        public const string Binary = "application/octet-stream";
+        public static string GetContentTypeHeader(string extension = null)
+            => $"Content-Type: {WebpagePanel.MimeTypes.GetMimeType(extension)}";
 
-        public static string GetContentTypeHeader(string extension = null) => $"Content-Type: {GetMimeType(extension)}";
-
-        public static string GetMimeType(string extension = null) => extension?.ToLowerInvariant() switch
-        {
-            ".js" => JavaScript, // Only handle known extensions from resources
-            ".json" => Json,
-            ".css" => Css,
-            ".html" => Html,
-            _ => Binary,
-        };
+        public static string GetMimeType(string extension = null)
+            => WebpagePanel.MimeTypes.GetMimeType(extension);
     }
 }
 

QuickLook.Plugin/QuickLook.Plugin.MediaInfoViewer/Plugin.cs

@@ -24,6 +24,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Media;
 
 namespace QuickLook.Plugin.MediaInfoViewer;
@@ -100,14 +101,15 @@ public partial class Plugin : IViewer, IMoreMenuExtended
         if (isDark)
         {
             context.Theme = Themes.Dark;
-            tvp.Foreground = new BrushConverter().ConvertFromString("#FFEFEFEF") as SolidColorBrush;
             tvp.Background = Brushes.Transparent;
+            tvp.SetResourceReference(TextBlock.ForegroundProperty, "WindowTextForeground");
         }
         else
         {
             context.Theme = Themes.Light;
-            tvp.Foreground = new BrushConverter().ConvertFromString("#BBFAFAFA") as SolidColorBrush;
-            tvp.Background = Brushes.Transparent;
+            tvp.Background = OSThemeHelper.AppsUseDarkTheme()
+                ? new SolidColorBrush(Color.FromArgb(175, 255, 255, 255))
+                : Brushes.Transparent;
         }
     }
 }

QuickLook.slnx

@@ -0,0 +1,71 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Any CPU" />
+    <Platform Name="x64" />
+  </Configurations>
+  <Folder Name="/QuickLook.Native/">
+    <Project Path="QuickLook.Native/QuickLook.Native32/QuickLook.Native32.vcxproj" Id="d31ee321-c2b0-4984-b749-736f7de509f1">
+      <Platform Project="Win32" />
+    </Project>
+    <Project Path="QuickLook.Native/QuickLook.Native64/QuickLook.Native64.vcxproj" Id="794e4dcf-f715-4836-9d30-abd296586d23" />
+  </Folder>
+  <Folder Name="/QuickLook.Plugin/">
+    <Project Path="QuickLook.Plugin/QuickLook.Plugin.AppViewer/QuickLook.Plugin.AppViewer.csproj" />
+    <Project Path="QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/QuickLook.Plugin.ArchiveViewer.csproj" />
+    <Project Path="QuickLook.Plugin/QuickLook.Plugin.CLSIDViewer/QuickLook.Plugin.CLSIDViewer.csproj" />
+    <Project Path="QuickLook.Plugin/QuickLook.Plugin.CsvViewer/QuickLook.Plugin.CsvViewer.csproj" />
+    <Project Path="QuickLook.Plugin/QuickLook.Plugin.ELFViewer/QuickLook.Plugin.ELFViewer.csproj" />
+    <Project Path="QuickLook.Plugin/QuickLook.Plugin.FontViewer/QuickLook.Plugin.FontViewer.csproj" />
+    <Project Path="QuickLook.Plugin/QuickLook.Plugin.HelixViewer/QuickLook.Plugin.HelixViewer.csproj" />
+    <Project Path="QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/QuickLook.Plugin.HtmlViewer.csproj" />
+    <Project Path="QuickLook.Plugin/QuickLook.Plugin.ImageViewer/QuickLook.Plugin.ImageViewer.csproj" />
+    <Project Path="QuickLook.Plugin/QuickLook.Plugin.MailViewer/QuickLook.Plugin.MailViewer.csproj" />
+    <Project Path="QuickLook.Plugin/QuickLook.Plugin.MarkdownViewer/QuickLook.Plugin.MarkdownViewer.csproj" />
+    <Project Path="QuickLook.Plugin/QuickLook.Plugin.MediaInfoViewer/QuickLook.Plugin.MediaInfoViewer.csproj" />
+    <Project Path="QuickLook.Plugin/QuickLook.Plugin.OfficeViewer/QuickLook.Plugin.OfficeViewer.csproj" />
+    <Project Path="QuickLook.Plugin/QuickLook.Plugin.PDFViewer/QuickLook.Plugin.PdfViewer.csproj" />
+    <Project Path="QuickLook.Plugin/QuickLook.Plugin.PEViewer/QuickLook.Plugin.PEViewer.csproj" />
+    <Project Path="QuickLook.Plugin/QuickLook.Plugin.PluginInstaller/QuickLook.Plugin.PluginInstaller.csproj" />
+    <Project Path="QuickLook.Plugin/QuickLook.Plugin.TextViewer/QuickLook.Plugin.TextViewer.csproj" />
+    <Project Path="QuickLook.Plugin/QuickLook.Plugin.ThumbnailViewer/QuickLook.Plugin.ThumbnailViewer.csproj" />
+    <Project Path="QuickLook.Plugin/QuickLook.Plugin.VideoViewer/QuickLook.Plugin.VideoViewer.csproj" />
+  </Folder>
+  <Folder Name="/Solution Items/">
+    <File Path="GitVersion.cs" />
+  </Folder>
+  <Project Path="QuickLook.Common/QuickLook.Common.csproj">
+    <Platform Solution="*|x64" Project="x64" />
+  </Project>
+  <Project Path="QuickLook.Installer/QuickLook.Installer.wixproj" Id="f0214fc2-efbe-426c-842d-b42bc37d9525">
+    <BuildDependency Project="QuickLook.Common/QuickLook.Common.csproj" />
+    <BuildDependency Project="QuickLook.Native/QuickLook.Native32/QuickLook.Native32.vcxproj" />
+    <BuildDependency Project="QuickLook.Native/QuickLook.Native64/QuickLook.Native64.vcxproj" />
+    <BuildDependency Project="QuickLook.Plugin/QuickLook.Plugin.AppViewer/QuickLook.Plugin.AppViewer.csproj" />
+    <BuildDependency Project="QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/QuickLook.Plugin.ArchiveViewer.csproj" />
+    <BuildDependency Project="QuickLook.Plugin/QuickLook.Plugin.CLSIDViewer/QuickLook.Plugin.CLSIDViewer.csproj" />
+    <BuildDependency Project="QuickLook.Plugin/QuickLook.Plugin.CsvViewer/QuickLook.Plugin.CsvViewer.csproj" />
+    <BuildDependency Project="QuickLook.Plugin/QuickLook.Plugin.ELFViewer/QuickLook.Plugin.ELFViewer.csproj" />
+    <BuildDependency Project="QuickLook.Plugin/QuickLook.Plugin.FontViewer/QuickLook.Plugin.FontViewer.csproj" />
+    <BuildDependency Project="QuickLook.Plugin/QuickLook.Plugin.HelixViewer/QuickLook.Plugin.HelixViewer.csproj" />
+    <BuildDependency Project="QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/QuickLook.Plugin.HtmlViewer.csproj" />
+    <BuildDependency Project="QuickLook.Plugin/QuickLook.Plugin.ImageViewer/QuickLook.Plugin.ImageViewer.csproj" />
+    <BuildDependency Project="QuickLook.Plugin/QuickLook.Plugin.MailViewer/QuickLook.Plugin.MailViewer.csproj" />
+    <BuildDependency Project="QuickLook.Plugin/QuickLook.Plugin.MarkdownViewer/QuickLook.Plugin.MarkdownViewer.csproj" />
+    <BuildDependency Project="QuickLook.Plugin/QuickLook.Plugin.MediaInfoViewer/QuickLook.Plugin.MediaInfoViewer.csproj" />
+    <BuildDependency Project="QuickLook.Plugin/QuickLook.Plugin.OfficeViewer/QuickLook.Plugin.OfficeViewer.csproj" />
+    <BuildDependency Project="QuickLook.Plugin/QuickLook.Plugin.PDFViewer/QuickLook.Plugin.PdfViewer.csproj" />
+    <BuildDependency Project="QuickLook.Plugin/QuickLook.Plugin.PEViewer/QuickLook.Plugin.PEViewer.csproj" />
+    <BuildDependency Project="QuickLook.Plugin/QuickLook.Plugin.PluginInstaller/QuickLook.Plugin.PluginInstaller.csproj" />
+    <BuildDependency Project="QuickLook.Plugin/QuickLook.Plugin.TextViewer/QuickLook.Plugin.TextViewer.csproj" />
+    <BuildDependency Project="QuickLook.Plugin/QuickLook.Plugin.ThumbnailViewer/QuickLook.Plugin.ThumbnailViewer.csproj" />
+    <BuildDependency Project="QuickLook.Plugin/QuickLook.Plugin.VideoViewer/QuickLook.Plugin.VideoViewer.csproj" />
+    <BuildDependency Project="QuickLook/QuickLook.csproj" />
+    <Platform Project="x86" />
+    <Build />
+  </Project>
+  <Project Path="QuickLook/QuickLook.csproj">
+    <BuildDependency Project="QuickLook.Native/QuickLook.Native32/QuickLook.Native32.vcxproj" />
+    <BuildDependency Project="QuickLook.Native/QuickLook.Native64/QuickLook.Native64.vcxproj" />
+    <Platform Solution="*|x64" Project="x64" />
+  </Project>
+</Solution>

QuickLook/TrayIconManager.cs

@@ -23,6 +23,7 @@ using System;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
+using System.Reflection;
 using System.Windows.Forms;
 using Wpf.Ui.Violeta.Win32;
 using ToolTipIcon = Wpf.Ui.Violeta.Win32.ToolTipIcon;
@@ -149,9 +150,30 @@ internal partial class TrayIconManager : IDisposable
         Action closeEvent = null)
     {
         var icon = GetInstance()._icon;
-        icon.ShowBalloonTip(timeout, title, content, isError ? ToolTipIcon.Error : ToolTipIcon.Info);
-        icon.BalloonTipClicked += OnIconOnBalloonTipClicked;
-        icon.BalloonTipClosed += OnIconOnBalloonTipClosed;
+        
+        try
+        {
+            // Use reflection to call ShowBalloonTip to avoid JIT compilation errors
+            // when the method signature doesn't match the expected one
+            var showBalloonTipMethod = icon.GetType().GetMethod("ShowBalloonTip", 
+                new[] { typeof(int), typeof(string), typeof(string), typeof(ToolTipIcon) });
+            
+            if (showBalloonTipMethod != null)
+            {
+                showBalloonTipMethod.Invoke(icon, new object[] { timeout, title, content, isError ? ToolTipIcon.Error : ToolTipIcon.Info });
+                icon.BalloonTipClicked += OnIconOnBalloonTipClicked;
+                icon.BalloonTipClosed += OnIconOnBalloonTipClosed;
+            }
+            else
+            {
+                System.Diagnostics.Debug.WriteLine($"ShowBalloonTip method not found: {title} - {content}");
+            }
+        }
+        catch (Exception ex)
+        {
+            // Fallback: If reflection fails, log and continue without showing notification
+            System.Diagnostics.Debug.WriteLine($"ShowBalloonTip failed: {title} - {content}. Error: {ex.Message}");
+        }
 
         void OnIconOnBalloonTipClicked(object sender, EventArgs e)
         {

QuickLook/ViewerWindow.Properties.cs

@@ -23,6 +23,8 @@ using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Input;
+using Wpf.Ui.Appearance;
+using Wpf.Ui.Violeta.Appearance;
 
 namespace QuickLook;
 
@@ -105,14 +107,24 @@ public partial class ViewerWindow : INotifyPropertyChanged
         if (isDark)
         {
             CurrentTheme = Themes.Dark;
+
+            // Update theme for QuickLook controls
             if (!Resources.MergedDictionaries.Contains(_darkDict))
                 Resources.MergedDictionaries.Add(_darkDict);
+
+            // Update theme for WPF-UI controls
+            ThemeManager.Apply(ApplicationTheme.Dark);
         }
         else
         {
             CurrentTheme = Themes.Light;
+
+            // Update theme for QuickLook controls
             if (Resources.MergedDictionaries.Contains(_darkDict))
                 Resources.MergedDictionaries.Remove(_darkDict);
+
+            // Update theme for WPF-UI controls
+            ThemeManager.Apply(ApplicationTheme.Light);
         }
     }
 }