Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -331,3 +331,4 @@ ASALocalRun/
/*.qlplugin
/GitVersion.cs
/QuickLook.Plugin.Metadata.config
QuickLook.Plugin.Metadata.config
77 changes: 72 additions & 5 deletions QuickLook.Plugin.PdfViewer-Native/WebpagePanel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@
using QuickLook.Common.Helpers;
using System;
using System.Diagnostics;
using System.Drawing;
using System.IO;
using System.Reflection;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using DrawingColor = System.Drawing.Color;

namespace QuickLook.Plugin.PDFViewerNative;

Expand All @@ -47,11 +48,63 @@ public WebpagePanel()
{
UserDataFolder = Path.Combine(SettingHelper.LocalDataPath, @"WebView2_Data\\"),
},
DefaultBackgroundColor = OSThemeHelper.AppsUseDarkTheme() ? Color.FromArgb(255, 32, 32, 32) : Color.White, // Prevent white flash in dark mode
DefaultBackgroundColor = OSThemeHelper.AppsUseDarkTheme() ? DrawingColor.FromArgb(255, 32, 32, 32) : DrawingColor.White, // Prevent white flash in dark mode
};
_webView.NavigationStarting += NavigationStarting_CancelNavigation;
_webView.NavigationCompleted += WebView_NavigationCompleted;
Content = _webView;

// Handle DPI changes to prevent display glitches when switching monitors
Loaded += OnLoaded;
Unloaded += OnUnloaded;
}
}

private void OnLoaded(object sender, RoutedEventArgs e)
{
var window = Window.GetWindow(this);
if (window != null)
{
window.DpiChanged += OnDpiChanged;
// Set initial rasterization scale
UpdateRasterizationScale(VisualTreeHelper.GetDpi(this).PixelsPerDip);
}
}

private void OnUnloaded(object sender, RoutedEventArgs e)
{
var window = Window.GetWindow(this);
if (window != null)
{
window.DpiChanged -= OnDpiChanged;
}
}

private void OnDpiChanged(object sender, DpiChangedEventArgs e)
{
// Update WebView2 rasterization scale when DPI changes
UpdateRasterizationScale(e.NewDpi.PixelsPerDip);
}

private void UpdateRasterizationScale(double scale)
{
if (_webView != null)
{
// Force WebView2 to refresh its rendering after DPI change
// This helps prevent display glitches when switching monitors
Dispatcher.InvokeAsync(() =>
{
if (_webView?.CoreWebView2 != null)
{
// Trigger a repaint by toggling visibility momentarily
var currentUri = _currentUri;
if (currentUri != null)
{
_webView.InvalidateVisual();
_webView.UpdateLayout();
}
}
}, System.Windows.Threading.DispatcherPriority.Render);
}
}

Expand Down Expand Up @@ -89,13 +142,27 @@ private void NavigationStarting_CancelNavigation(object sender, CoreWebView2Navi

private void WebView_NavigationCompleted(object sender, CoreWebView2NavigationCompletedEventArgs e)
{
_webView.DefaultBackgroundColor = Color.White; // Reset to white after page load to match expected default behavior
_webView.DefaultBackgroundColor = DrawingColor.White; // Reset to white after page load to match expected default behavior
}

public void Dispose()
{
_webView?.Dispose();
_webView = null;
if (_webView != null)
{
_webView.NavigationStarting -= NavigationStarting_CancelNavigation;
_webView.NavigationCompleted -= WebView_NavigationCompleted;
_webView.Dispose();
_webView = null;
}

Loaded -= OnLoaded;
Unloaded -= OnUnloaded;

var window = Window.GetWindow(this);
if (window != null)
{
window.DpiChanged -= OnDpiChanged;
}
}

private object CreateDownloadButton()
Expand Down