Skip to content

Commit 5d740e7

Browse files
committed
Add --disable-features=RendererAppContainer WebView2Environment option (#30412)
1 parent d61aa3a commit 5d740e7

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandlerControl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public override void DoPreview<T>(T dataSource)
130130
DefaultBackgroundColor = Color.Transparent,
131131
};
132132

133-
var webView2Options = new CoreWebView2EnvironmentOptions("--block-new-web-contents");
133+
var webView2Options = new CoreWebView2EnvironmentOptions("--block-new-web-contents --disable-features=RendererAppContainer");
134134
ConfiguredTaskAwaitable<CoreWebView2Environment>.ConfiguredTaskAwaiter
135135
webView2EnvironmentAwaiter = CoreWebView2Environment
136136
.CreateAsync(userDataFolder: _webView2UserDataFolder, options: webView2Options)

src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandlerControl.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,13 @@ public override void DoPreview<T>(T dataSource)
125125
InitializeIndexFileAndSelectedFile(filePath);
126126

127127
Logger.LogInfo("Create WebView2 environment");
128+
var webView2Options = new CoreWebView2EnvironmentOptions("--disable-features=RendererAppContainer");
128129
ConfiguredTaskAwaitable<CoreWebView2Environment>.ConfiguredTaskAwaiter
129130
webView2EnvironmentAwaiter = CoreWebView2Environment
130-
.CreateAsync(userDataFolder: System.Environment.GetEnvironmentVariable("USERPROFILE") +
131-
"\\AppData\\LocalLow\\Microsoft\\PowerToys\\MonacoPreview-Temp")
131+
.CreateAsync(
132+
userDataFolder: System.Environment.GetEnvironmentVariable("USERPROFILE") +
133+
"\\AppData\\LocalLow\\Microsoft\\PowerToys\\MonacoPreview-Temp",
134+
options: webView2Options)
132135
.ConfigureAwait(true).GetAwaiter();
133136
webView2EnvironmentAwaiter.OnCompleted(async () =>
134137
{

src/modules/previewpane/SvgPreviewHandler/SvgPreviewControl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ private void AddWebViewControl(string svgData)
225225
_browser.Dock = DockStyle.Fill;
226226

227227
// Prevent new windows from being opened.
228-
var webView2Options = new CoreWebView2EnvironmentOptions("--block-new-web-contents");
228+
var webView2Options = new CoreWebView2EnvironmentOptions("--block-new-web-contents --disable-features=RendererAppContainer");
229229
ConfiguredTaskAwaitable<CoreWebView2Environment>.ConfiguredTaskAwaiter
230230
webView2EnvironmentAwaiter = CoreWebView2Environment
231231
.CreateAsync(userDataFolder: _webView2UserDataFolder, options: webView2Options)

src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public Bitmap GetThumbnailImpl(uint cx)
142142
thumbnailDone.Set();
143143
};
144144

145-
var webView2Options = new CoreWebView2EnvironmentOptions("--block-new-web-contents");
145+
var webView2Options = new CoreWebView2EnvironmentOptions("--block-new-web-contents --disable-features=RendererAppContainer");
146146
ConfiguredTaskAwaitable<CoreWebView2Environment>.ConfiguredTaskAwaiter
147147
webView2EnvironmentAwaiter = CoreWebView2Environment
148148
.CreateAsync(userDataFolder: _webView2UserDataFolder, options: webView2Options)

0 commit comments

Comments
 (0)