Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-05 10:46:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Peek]Always use default white background for HTML files(#28557)

Browse Source 
* [Peek] A check for color of body element in html and change it based on theme is added.

* [Peek] WebView2 solution is added instead of javascript injection

* [Peek] Detailed comments are added.
This commit is contained in:
gokcekantarci
2023-09-20 20:30:32 +03:00
committed by GitHub
parent 0a1759028d
commit 5ddd8d72dd
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/peek/Peek.FilePreviewer/Controls/BrowserControl.xaml.cs
View File

@@ -24,6 +24,8 @@ namespace Peek.FilePreviewer.Controls
/// </summary> /// </summary>
private Uri? _navigatedUri; private Uri? _navigatedUri;
private Color originalBackgroundColor;
public delegate void NavigationCompletedHandler(WebView2? sender, CoreWebView2NavigationCompletedEventArgs? args); public delegate void NavigationCompletedHandler(WebView2? sender, CoreWebView2NavigationCompletedEventArgs? args);
public delegate void DOMContentLoadedHandler(CoreWebView2? sender, CoreWebView2DOMContentLoadedEventArgs? args); public delegate void DOMContentLoadedHandler(CoreWebView2? sender, CoreWebView2DOMContentLoadedEventArgs? args);
@@ -120,7 +122,11 @@ namespace Peek.FilePreviewer.Controls
{ {
await PreviewBrowser.EnsureCoreWebView2Async(); await PreviewBrowser.EnsureCoreWebView2Async();
// transparent background when loading the page // Storing the original background color so it can be reset later for specific file types like HTML.
originalBackgroundColor = PreviewBrowser.DefaultBackgroundColor;
// Setting the background color to transparent when initially loading the WebView2 component.
// This ensures that non-HTML files are displayed with a transparent background.
PreviewBrowser.DefaultBackgroundColor = Color.FromArgb(0, 0, 0, 0); PreviewBrowser.DefaultBackgroundColor = Color.FromArgb(0, 0, 0, 0);
PreviewBrowser.CoreWebView2.Settings.AreDefaultScriptDialogsEnabled = false; PreviewBrowser.CoreWebView2.Settings.AreDefaultScriptDialogsEnabled = false;
@@ -150,6 +156,15 @@ namespace Peek.FilePreviewer.Controls
private void CoreWebView2_DOMContentLoaded(CoreWebView2 sender, CoreWebView2DOMContentLoadedEventArgs args) private void CoreWebView2_DOMContentLoaded(CoreWebView2 sender, CoreWebView2DOMContentLoadedEventArgs args)
{ {
// If the file being previewed is HTML or HTM, reset the background color to its original state.
// This is done to ensure that HTML and HTM files are displayed as intended, with their own background settings.
if (Source?.ToString().EndsWith(".html", StringComparison.OrdinalIgnoreCase) == true ||
Source?.ToString().EndsWith(".htm", StringComparison.OrdinalIgnoreCase) == true)
{
// Reset to default behavior for HTML files
PreviewBrowser.DefaultBackgroundColor = originalBackgroundColor;
}
DOMContentLoaded?.Invoke(sender, args); DOMContentLoaded?.Invoke(sender, args);
} }