Fix Webview2 persist and width #3 #4

emako · emako · commit a8b51808fb40 · 2025-05-29T17:31:46.000+08:00
diff --git a/QuickLook.Common b/QuickLook.Common
@@ -1 +1 @@
-Subproject commit e94c73fa276af53b55a50726d7d0cff14fa2d230
+Subproject commit 474d7be09e8a8f9bab36640b642659fb33d12c83
diff --git a/QuickLook.Plugin.PdfViewer-Native/Helper.cs b/QuickLook.Plugin.PdfViewer-Native/Helper.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021 Paddy Xu and Frank Becker
+// Copyright © 2017-2025 QL-Win Contributors
 //
 // This file is part of QuickLook program.
 //
diff --git a/QuickLook.Plugin.PdfViewer-Native/Plugin.cs b/QuickLook.Plugin.PdfViewer-Native/Plugin.cs
@@ -1,4 +1,4 @@
-﻿// Copyright © 2024 ema
+﻿// Copyright © 2017-2025 QL-Win Contributors
 //
 // This file is part of QuickLook program.
 //
@@ -25,6 +25,9 @@ namespace QuickLook.Plugin.PDFViewerNative;
 
 public class Plugin : IViewer
 {
+    private static double _width = 1000;
+    private static double _height = 1200;
+
     public int Priority => 1;
 
     private WebpagePanel _panel;
@@ -44,7 +47,7 @@ public bool CanHandle(string path)
 
     public void Prepare(string path, ContextObject context)
     {
-        context.PreferredSize = new Size(1280, 720);
+        context.SetPreferredSizeFit(new Size(_width, _height), 0.9d);
     }
 
     public void View(string path, ContextObject context)
@@ -59,6 +62,12 @@ public void View(string path, ContextObject context)
 
     public void Cleanup()
     {
+        _width = _panel.ActualWidth;
+        _height = _panel.ActualHeight;
+
+        _panel?.Dispose();
+        _panel = null;
+
         GC.SuppressFinalize(this);
     }
 }
diff --git a/QuickLook.Plugin.PdfViewer-Native/WebpagePanel.cs b/QuickLook.Plugin.PdfViewer-Native/WebpagePanel.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021 Paddy Xu and Frank Becker
+// Copyright © 2017-2025 QL-Win Contributors
 //
 // This file is part of QuickLook program.
 //

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright © 2021 Paddy Xu and Frank Becker`
	`1`	`+// Copyright © 2017-2025 QL-Win Contributors`
`2`	`2`	`//`
`3`	`3`	`// This file is part of QuickLook program.`
`4`	`4`	`//`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright © 2024 ema`
	`1`	`+// Copyright © 2017-2025 QL-Win Contributors`
`2`	`2`	`//`
`3`	`3`	`// This file is part of QuickLook program.`
`4`	`4`	`//`
`@@ -25,6 +25,9 @@ namespace QuickLook.Plugin.PDFViewerNative;`
`25`	`25`
`26`	`26`	`public class Plugin : IViewer`
`27`	`27`	`{`
	`28`	`+ private static double _width = 1000;`
	`29`	`+ private static double _height = 1200;`
	`30`	`+`
`28`	`31`	`public int Priority => 1;`
`29`	`32`
`30`	`33`	`private WebpagePanel _panel;`
`@@ -44,7 +47,7 @@ public bool CanHandle(string path)`
`44`	`47`
`45`	`48`	`public void Prepare(string path, ContextObject context)`
`46`	`49`	`{`
`47`		`- context.PreferredSize = new Size(1280, 720);`
	`50`	`+ context.SetPreferredSizeFit(new Size(_width, _height), 0.9d);`
`48`	`51`	`}`
`49`	`52`
`50`	`53`	`public void View(string path, ContextObject context)`
`@@ -59,6 +62,12 @@ public void View(string path, ContextObject context)`
`59`	`62`
`60`	`63`	`public void Cleanup()`
`61`	`64`	`{`
	`65`	`+ _width = _panel.ActualWidth;`
	`66`	`+ _height = _panel.ActualHeight;`
	`67`	`+`
	`68`	`+ _panel?.Dispose();`
	`69`	`+ _panel = null;`
	`70`	`+`
`62`	`71`	`GC.SuppressFinalize(this);`
`63`	`72`	`}`
`64`	`73`	`}`