nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

webview: Don't register the same resources twice

Browse source
This commit is contained in:
Niels De Graef 2025-07-21 10:33:13 +02:00
parent 3ff4fe5b6a
commit d44e934ccf
2 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/client/components/components-web-view.vala
View file

@ -67,9 +67,9 @@ public abstract class Components.WebView : WebKit.WebView, Geary.BaseInterface {
private static WebKit.WebContext? default_context = null; private static WebKit.WebContext? default_context = null;
private static List<WebKit.UserStyleSheet> styles = new List<WebKit.UserStyleSheet>(); private static GenericArray<WebKit.UserStyleSheet> styles = null;
private static List<WebKit.UserScript> scripts = new List<WebKit.UserScript>(); private static GenericArray<WebKit.UserScript> scripts = null;
/** /**
@ -126,14 +126,18 @@ public abstract class Components.WebView : WebKit.WebView, Geary.BaseInterface {
*/ */
public static void load_resources(GLib.File user_dir) public static void load_resources(GLib.File user_dir)
throws GLib.Error { throws GLib.Error {
WebView.scripts.append(load_app_script("darkreader.js")); // Initialize, or overwrite any user scripts/styles we've loaded before
WebView.scripts.append(load_app_script("components-web-view.js")); WebView.scripts = new GenericArray<WebKit.UserScript>();
WebView.styles.append(load_app_stylesheet("components-web-view.css")); WebView.styles = new GenericArray<WebKit.UserStyleSheet>();
WebView.scripts.add(load_app_script("darkreader.js"));
WebView.scripts.add(load_app_script("components-web-view.js"));
WebView.styles.add(load_app_stylesheet("components-web-view.css"));
foreach (string name in new string[] { USER_CSS, USER_CSS_LEGACY }) { foreach (string name in new string[] { USER_CSS, USER_CSS_LEGACY }) {
GLib.File stylesheet = user_dir.get_child(name); GLib.File stylesheet = user_dir.get_child(name);
try { try {
WebView.styles.append(load_user_stylesheet(stylesheet)); WebView.styles.add(load_user_stylesheet(stylesheet));
break; break;
} catch (GLib.IOError.NOT_FOUND err) { } catch (GLib.IOError.NOT_FOUND err) {
// All good, try the next one or just exit // All good, try the next one or just exit
@ -352,7 +356,9 @@ public abstract class Components.WebView : WebKit.WebView, Geary.BaseInterface {
custom_manager ?? new WebKit.UserContentManager(); custom_manager ?? new WebKit.UserContentManager();
if (config.unset_html_colors) { if (config.unset_html_colors) {
WebView.scripts.append( if (WebView.scripts == null)
WebView.scripts = new GenericArray<WebKit.UserScript>();
WebView.scripts.add(
new WebKit.UserScript( new WebKit.UserScript(
"window.UNSET_HTML_COLORS = true;", "window.UNSET_HTML_COLORS = true;",
WebKit.UserContentInjectedFrames.TOP_FRAME, WebKit.UserContentInjectedFrames.TOP_FRAME,
@ -363,8 +369,12 @@ public abstract class Components.WebView : WebKit.WebView, Geary.BaseInterface {
); );
} }
WebView.scripts.foreach(script => content_manager.add_script(script)); if (WebView.scripts != null) {
WebView.styles.foreach(style => content_manager.add_style_sheet(style)); WebView.scripts.foreach(script => content_manager.add_script(script));
}
if (WebView.styles != null) {
WebView.styles.foreach(style => content_manager.add_style_sheet(style));
}
Object( Object(
settings: setts, settings: setts,

0
subprojects/.wraplock Normal file
View file