Skip to content

Commit 4a6d925

Browse files
gave92gave92
committed
Revert "Use WebView2Ex for CornerRadius"
This reverts commit 1b41f66.
1 parent 82e9087 commit 4a6d925

33 files changed

+31
-2748
lines changed

‎Files.sln‎

Lines changed: 8 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Files.App.SaveDialog.Win32"
4545
EndProject
4646
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Files.App.OpenDialog.Win32", "src\Files.App.OpenDialog\Files.App.OpenDialog.Win32.vcxproj", "{B3FE3F3B-CECC-4918-B72B-5488C3774125}"
4747
EndProject
48-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "external", "external", "{E7E1BB8C-1AA2-4D7E-BD85-A63E0A25948D}"
49-
EndProject
50-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebView2Ex.WinUI", "src\WebView2Ex.WinUI\WebView2Ex.WinUI.csproj", "{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}"
51-
EndProject
52-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "WebView2Ex.Shared", "src\WebView2Ex.Shared\WebView2Ex.Shared.shproj", "{DA1F3539-44D9-49B0-A7D6-CA2CC2756E1D}"
53-
EndProject
5448
Global
5549
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5650
Debug|arm64 = Debug|arm64
@@ -461,82 +455,52 @@ Global
461455
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Debug|arm64.Build.0 = Debug|Win32
462456
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Debug|x64.ActiveCfg = Debug|Win32
463457
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Debug|x64.Build.0 = Debug|Win32
464-
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Debug|x86.ActiveCfg = Debug|Win32
465458
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Preview|arm64.ActiveCfg = Debug|Win32
466459
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Preview|arm64.Build.0 = Debug|Win32
467460
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Preview|x64.ActiveCfg = Debug|Win32
468461
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Preview|x64.Build.0 = Debug|Win32
469-
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Preview|x86.ActiveCfg = Debug|Win32
470462
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Release|arm64.ActiveCfg = Release|Win32
471463
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Release|arm64.Build.0 = Release|Win32
472464
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Release|x64.ActiveCfg = Release|Win32
473465
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Release|x64.Build.0 = Release|Win32
474-
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Release|x86.ActiveCfg = Release|Win32
475466
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Stable|arm64.ActiveCfg = Debug|Win32
476467
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Stable|arm64.Build.0 = Debug|Win32
477468
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Stable|x64.ActiveCfg = Debug|Win32
478469
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Stable|x64.Build.0 = Debug|Win32
479-
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Stable|x86.ActiveCfg = Debug|Win32
480470
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Store|arm64.ActiveCfg = Debug|Win32
481471
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Store|arm64.Build.0 = Debug|Win32
482472
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Store|x64.ActiveCfg = Debug|Win32
483473
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Store|x64.Build.0 = Debug|Win32
484474
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Store|x86.ActiveCfg = Debug|Win32
475+
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Debug|x86.ActiveCfg = Debug|Win32
476+
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Preview|x86.ActiveCfg = Debug|Win32
477+
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Release|x86.ActiveCfg = Release|Win32
478+
{7756A1A4-17B5-4E6B-9B12-F19AA868A225}.Stable|x86.ActiveCfg = Debug|Win32
485479
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Debug|arm64.ActiveCfg = Debug|Win32
486480
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Debug|arm64.Build.0 = Debug|Win32
487481
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Debug|x64.ActiveCfg = Debug|Win32
488482
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Debug|x64.Build.0 = Debug|Win32
489-
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Debug|x86.ActiveCfg = Debug|Win32
490483
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Preview|arm64.ActiveCfg = Debug|Win32
491484
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Preview|arm64.Build.0 = Debug|Win32
492485
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Preview|x64.ActiveCfg = Debug|Win32
493486
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Preview|x64.Build.0 = Debug|Win32
494-
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Preview|x86.ActiveCfg = Debug|Win32
495487
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Release|arm64.ActiveCfg = Release|Win32
496488
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Release|arm64.Build.0 = Release|Win32
497489
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Release|x64.ActiveCfg = Release|Win32
498490
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Release|x64.Build.0 = Release|Win32
499-
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Release|x86.ActiveCfg = Release|Win32
500491
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Stable|arm64.ActiveCfg = Debug|Win32
501492
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Stable|arm64.Build.0 = Debug|Win32
502493
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Stable|x64.ActiveCfg = Debug|Win32
503494
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Stable|x64.Build.0 = Debug|Win32
504-
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Stable|x86.ActiveCfg = Debug|Win32
505495
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Store|arm64.ActiveCfg = Debug|Win32
506496
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Store|arm64.Build.0 = Debug|Win32
507497
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Store|x64.ActiveCfg = Debug|Win32
508498
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Store|x64.Build.0 = Debug|Win32
509499
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Store|x86.ActiveCfg = Debug|Win32
510-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Debug|arm64.ActiveCfg = Debug|arm64
511-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Debug|arm64.Build.0 = Debug|arm64
512-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Debug|x64.ActiveCfg = Debug|x64
513-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Debug|x64.Build.0 = Debug|x64
514-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Debug|x86.ActiveCfg = Debug|x86
515-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Debug|x86.Build.0 = Debug|x86
516-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Preview|arm64.ActiveCfg = Debug|arm64
517-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Preview|arm64.Build.0 = Debug|arm64
518-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Preview|x64.ActiveCfg = Debug|x64
519-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Preview|x64.Build.0 = Debug|x64
520-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Preview|x86.ActiveCfg = Debug|x86
521-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Preview|x86.Build.0 = Debug|x86
522-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Release|arm64.ActiveCfg = Release|arm64
523-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Release|arm64.Build.0 = Release|arm64
524-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Release|x64.ActiveCfg = Release|x64
525-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Release|x64.Build.0 = Release|x64
526-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Release|x86.ActiveCfg = Release|x86
527-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Release|x86.Build.0 = Release|x86
528-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Stable|arm64.ActiveCfg = Debug|arm64
529-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Stable|arm64.Build.0 = Debug|arm64
530-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Stable|x64.ActiveCfg = Debug|x64
531-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Stable|x64.Build.0 = Debug|x64
532-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Stable|x86.ActiveCfg = Debug|x86
533-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Stable|x86.Build.0 = Debug|x86
534-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Store|arm64.ActiveCfg = Debug|arm64
535-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Store|arm64.Build.0 = Debug|arm64
536-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Store|x64.ActiveCfg = Debug|x64
537-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Store|x64.Build.0 = Debug|x64
538-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Store|x86.ActiveCfg = Debug|x86
539-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02}.Store|x86.Build.0 = Debug|x86
500+
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Debug|x86.ActiveCfg = Debug|Win32
501+
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Preview|x86.ActiveCfg = Debug|Win32
502+
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Release|x86.ActiveCfg = Release|Win32
503+
{B3FE3F3B-CECC-4918-B72B-5488C3774125}.Stable|x86.ActiveCfg = Debug|Win32
540504
EndGlobalSection
541505
GlobalSection(SolutionProperties) = preSolution
542506
HideSolutionNode = FALSE
@@ -558,15 +522,8 @@ Global
558522
{EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6} = {A188C26B-E731-4E0B-9D17-D21CEBD9B43F}
559523
{7756A1A4-17B5-4E6B-9B12-F19AA868A225} = {A188C26B-E731-4E0B-9D17-D21CEBD9B43F}
560524
{B3FE3F3B-CECC-4918-B72B-5488C3774125} = {A188C26B-E731-4E0B-9D17-D21CEBD9B43F}
561-
{E7E1BB8C-1AA2-4D7E-BD85-A63E0A25948D} = {A74DCE98-A744-4D71-A2B1-7EE4FED0936B}
562-
{04488D6F-84CB-4EFE-BA04-CB6A7B7AEF02} = {E7E1BB8C-1AA2-4D7E-BD85-A63E0A25948D}
563-
{DA1F3539-44D9-49B0-A7D6-CA2CC2756E1D} = {E7E1BB8C-1AA2-4D7E-BD85-A63E0A25948D}
564525
EndGlobalSection
565526
GlobalSection(ExtensibilityGlobals) = postSolution
566527
SolutionGuid = {0E62043C-A7A1-4982-9EC9-4CDB2939B776}
567528
EndGlobalSection
568-
GlobalSection(SharedMSBuildProjectFiles) = preSolution
569-
src\WebView2Ex.Shared\WebView2Ex.Shared.projitems*{04488d6f-84cb-4efe-ba04-cb6a7b7aef02}*SharedItemsImports = 5
570-
src\WebView2Ex.Shared\WebView2Ex.Shared.projitems*{da1f3539-44d9-49b0-a7d6-ca2cc2756e1d}*SharedItemsImports = 13
571-
EndGlobalSection
572529
EndGlobal

‎src/Files.App/Extensions/WebView2Extensions.cs‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,18 @@
1111

1212
namespace Files.App.Extensions
1313
{
14-
using WebViewMessageReceivedHandler = TypedEventHandler<CoreWebView2, CoreWebView2WebMessageReceivedEventArgs>;
14+
using WebViewMessageReceivedHandler = TypedEventHandler<WebView2, CoreWebView2WebMessageReceivedEventArgs>;
1515

1616
/// <summary>
1717
/// Code modified from https://gist.github.com/mqudsi/ceb4ecee76eb4c32238a438664783480
1818
/// </summary>
1919
public static class WebView2Extensions
2020
{
21+
public static void Navigate(this WebView2 webview, Uri url)
22+
{
23+
webview.Source = url;
24+
}
25+
2126
private enum PropertyAction
2227
{
2328
Read = 0,
@@ -45,7 +50,7 @@ private struct PropertyWebMessage
4550
}
4651

4752
public static List<WebViewMessageReceivedHandler> _handlers = new();
48-
public static async Task AddWebAllowedObject<T>(this CoreWebView2 webview, string name, T @object)
53+
public static async Task AddWebAllowedObject<T>(this WebView2 webview, string name, T @object)
4954
{
5055
var sb = new StringBuilder();
5156
sb.AppendLine($"window.{name} = {{ ");
@@ -191,7 +196,7 @@ public static async Task AddWebAllowedObject<T>(this CoreWebView2 webview, strin
191196
webview.WebMessageReceived += handler;
192197
}
193198

194-
public static async Task<string> InvokeScriptAsync(this WebView2Ex.UI.WebView2Ex webview, string function, params object[] args)
199+
public static async Task<string> InvokeScriptAsync(this WebView2 webview, string function, params object[] args)
195200
{
196201
var array = JsonConvert.SerializeObject(args);
197202
string result = null;
@@ -201,7 +206,7 @@ await webview.DispatcherQueue.EnqueueAsync(async () =>
201206
var script = $"{function}(...{array});";
202207
try
203208
{
204-
result = await webview.WebView2Runtime.CoreWebView2.ExecuteScriptAsync(script).AsTask();
209+
result = await webview.ExecuteScriptAsync(script).AsTask();
205210
result = JsonConvert.DeserializeObject<string>(result);
206211
}
207212
catch (Exception ex)

‎src/Files.App/Files.App.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@
115115
<ProjectReference Include="..\Files.Core.Storage\Files.Core.Storage.csproj" />
116116
<ProjectReference Include="..\Files.Shared\Files.Shared.csproj" />
117117
<ProjectReference Include="..\Files.Core.SourceGenerator\Files.Core.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
118-
<ProjectReference Include="..\WebView2Ex.WinUI\WebView2Ex.WinUI.csproj" />
119118
</ItemGroup>
120119

121120
<ItemGroup>

‎src/Files.App/UserControls/TerminalView.xaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,19 @@
66
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
77
xmlns:local="using:Files.App.Terminal"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9-
xmlns:ww2="using:WebView2Ex.UI"
109
d:DesignHeight="300"
1110
d:DesignWidth="400"
1211
ActualThemeChanged="TerminalView_ActualThemeChanged"
1312
Unloaded="TerminalView_Unloaded"
1413
mc:Ignorable="d">
1514

16-
<Border x:Name="RootGrid" CornerRadius="8">
15+
<Border x:Name="RootGrid">
1716

18-
<ww2:WebView2Ex
17+
<WebView2
1918
x:Name="WebViewControl"
2019
HorizontalAlignment="Stretch"
2120
VerticalAlignment="Stretch"
22-
CornerRadius="8"
21+
DefaultBackgroundColor="Transparent"
2322
Loaded="WebViewControl_Loaded" />
2423

2524
</Border>

‎src/Files.App/UserControls/TerminalView.xaml.cs‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using Files.App.Utils.Terminal;
33
using Files.App.Utils.Terminal.ConPTY;
44
using Microsoft.Extensions.Logging;
5-
using Microsoft.UI.Windowing;
65
using Microsoft.UI.Xaml.Controls;
76
using Microsoft.Web.WebView2.Core;
87
using System.IO;
@@ -110,7 +109,7 @@ private async Task ResizeTask()
110109
public event EventHandler<string> OnPaste;
111110
public event EventHandler<string> OnSessionRestart;
112111

113-
public WebView2Ex.UI.WebView2Ex WebView => WebViewControl;
112+
public WebView2 WebView => WebViewControl;
114113

115114
private Terminal _terminal;
116115
private BufferedReader _reader;
@@ -127,7 +126,7 @@ public TerminalView()
127126

128127
private async void WebViewControl_Loaded(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
129128
{
130-
if (WebViewControl.WebView2Runtime?.CoreWebView2?.Source is not null)
129+
if (WebViewControl.Source is not null)
131130
return;
132131

133132
var envOptions = new CoreWebView2EnvironmentOptions()
@@ -137,19 +136,14 @@ private async void WebViewControl_Loaded(object sender, Microsoft.UI.Xaml.Routed
137136
AdditionalBrowserArguments = "--enable-features=OverlayScrollbar,OverlayScrollbarWinStyle,OverlayScrollbarWinStyleAnimation"
138137
};
139138
var environment = await CoreWebView2Environment.CreateWithOptionsAsync("", "", envOptions);
140-
141-
var window = AppWindow.GetFromWindowId(XamlRoot.ContentIslandEnvironment.AppWindowId);
142-
WebViewControl.SetWindow(window);
143-
WebViewControl.WebView2Runtime = await WebView2Ex.WebView2Runtime.CreateAsync(environment, (nint)window.Id.Value);
144-
WebViewControl.WebView2Runtime.Controller!.DefaultBackgroundColor = Microsoft.UI.Colors.Transparent;
145-
139+
await WebViewControl.EnsureCoreWebView2Async(environment);
146140
//WebViewControl.CoreWebView2.OpenDevToolsWindow();
147-
WebViewControl.WebView2Runtime.CoreWebView2.NavigationCompleted += WebViewControl_NavigationCompleted;
148-
WebViewControl.WebView2Runtime.CoreWebView2.SetVirtualHostNameToFolderMapping(
141+
WebViewControl.NavigationCompleted += WebViewControl_NavigationCompleted;
142+
WebViewControl.CoreWebView2.SetVirtualHostNameToFolderMapping(
149143
"terminal.files",
150144
Path.Combine(Package.Current.InstalledLocation.Path, "Utils", "Terminal", "UI"),
151145
CoreWebView2HostResourceAccessKind.DenyCors);
152-
WebViewControl.WebView2Runtime.CoreWebView2.Navigate("http://terminal.files/index.html");
146+
WebViewControl.Source = new Uri("http://terminal.files/index.html");
153147

154148
// Waiting for WebView.NavigationCompleted event to happen
155149
await _tcsNavigationCompleted.Task;
@@ -159,7 +153,7 @@ private async void WebViewControl_Loaded(object sender, Microsoft.UI.Xaml.Routed
159153
var keyBindings = provider.GetCommandKeyBindings();
160154
var theme = provider.GetPreInstalledThemes().First(x => x.Id == _profile.TerminalThemeId);
161155

162-
WebViewControl.WebView2Runtime.CoreWebView2.Profile.PreferredColorScheme = (ActualTheme == Microsoft.UI.Xaml.ElementTheme.Dark) ? CoreWebView2PreferredColorScheme.Dark : CoreWebView2PreferredColorScheme.Light;
156+
WebViewControl.CoreWebView2.Profile.PreferredColorScheme = (ActualTheme == Microsoft.UI.Xaml.ElementTheme.Dark) ? CoreWebView2PreferredColorScheme.Dark : CoreWebView2PreferredColorScheme.Light;
163157

164158
var size = await CreateXtermViewAsync(options, theme.Colors,
165159
keyBindings.Values.SelectMany(k => k)).ConfigureAwait(false);
@@ -213,10 +207,10 @@ public Task<string> SerializeXtermStateAsync()
213207
return ExecuteScriptAsync(@"serializeTerminal()");
214208
}
215209

216-
private async void WebViewControl_NavigationCompleted(CoreWebView2 sender, CoreWebView2NavigationCompletedEventArgs args)
210+
private async void WebViewControl_NavigationCompleted(WebView2 sender, CoreWebView2NavigationCompletedEventArgs args)
217211
{
218212
var _terminalBridge = new TerminalBridge(this);
219-
await WebViewControl.WebView2Runtime.CoreWebView2.AddWebAllowedObject("terminalBridge", _terminalBridge);
213+
await WebViewControl.AddWebAllowedObject("terminalBridge", _terminalBridge);
220214
_tcsNavigationCompleted.TrySetResult(null);
221215
}
222216

@@ -453,7 +447,7 @@ private async void TerminalView_ActualThemeChanged(Microsoft.UI.Xaml.FrameworkEl
453447
serializerSettings.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
454448
var theme = new DefaultValueProvider().GetPreInstalledThemes().First(x => x.Id == _profile.TerminalThemeId);
455449

456-
WebViewControl.WebView2Runtime.CoreWebView2.Profile.PreferredColorScheme = (ActualTheme == Microsoft.UI.Xaml.ElementTheme.Dark) ? CoreWebView2PreferredColorScheme.Dark : CoreWebView2PreferredColorScheme.Light;
450+
WebViewControl.CoreWebView2.Profile.PreferredColorScheme = (ActualTheme == Microsoft.UI.Xaml.ElementTheme.Dark) ? CoreWebView2PreferredColorScheme.Dark : CoreWebView2PreferredColorScheme.Light;
457451

458452
var serializedTheme = JsonSerializer.Serialize(theme.Colors, serializerSettings);
459453
await ExecuteScriptAsync($"changeTheme('{serializedTheme}')");

‎src/Files.App/Utils/Terminal/TerminalBridge.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,6 @@ public interface IxtermEventListener
122122
event EventHandler<string> OnPaste;
123123
event EventHandler<string> OnSessionRestart;
124124

125-
public WebView2Ex.UI.WebView2Ex WebView { get; }
125+
public WebView2 WebView { get; }
126126
}
127127
}

0 commit comments

Comments
 (0)