Skip to content

Commit c344f7f

Browse files
committed
Change default location
1 parent ee6b620 commit c344f7f

4 files changed

Lines changed: 25 additions & 8 deletions

File tree

src/UniGetUI.Avalonia/App.axaml.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,15 +158,17 @@ public static void ApplyTheme(string value)
158158
};
159159
}
160160

161+
public static string WebViewUserDataFolder { get; } =
162+
Path.Join(Path.GetTempPath(), "UniGetUI", "WebView");
163+
161164
private static void SetUpWebViewUserDataFolder()
162165
{
163166
try
164167
{
165-
string webViewPath = Path.Join(Path.GetTempPath(), "UniGetUI", "WebView");
166-
if (!Directory.Exists(webViewPath))
167-
Directory.CreateDirectory(webViewPath);
168+
if (!Directory.Exists(WebViewUserDataFolder))
169+
Directory.CreateDirectory(WebViewUserDataFolder);
168170

169-
Environment.SetEnvironmentVariable("WEBVIEW2_USER_DATA_FOLDER", webViewPath);
171+
Environment.SetEnvironmentVariable("WEBVIEW2_USER_DATA_FOLDER", WebViewUserDataFolder);
170172
}
171173
catch (Exception e)
172174
{
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
using Avalonia.Controls;
2+
using Avalonia.Platform;
3+
4+
namespace UniGetUI.Avalonia.Views.Controls;
5+
6+
public sealed class UniGetUiWebView : NativeWebView
7+
{
8+
public UniGetUiWebView()
9+
{
10+
EnvironmentRequested += (_, args) =>
11+
{
12+
if (args is WindowsWebView2EnvironmentRequestedEventArgs winArgs)
13+
winArgs.UserDataFolder = App.WebViewUserDataFolder;
14+
};
15+
}
16+
}

src/UniGetUI.Avalonia/Views/Pages/HelpPage.axaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
55
xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages"
66
xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
7-
xmlns:wv="using:Avalonia.Controls"
87
xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
98
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
109
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -75,7 +74,7 @@
7574

7675
<!-- WebView -->
7776
<Border x:Name="WebViewBorder" Grid.Row="2" CornerRadius="6" ClipToBounds="True">
78-
<wv:NativeWebView x:Name="WebViewControl"/>
77+
<controls:UniGetUiWebView x:Name="WebViewControl"/>
7978
</Border>
8079

8180
<!-- Linux fallback -->

src/UniGetUI.Avalonia/Views/Pages/ReleaseNotesPage.axaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
55
xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages"
6-
xmlns:wv="using:Avalonia.Controls"
6+
xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
77
xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
88
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
99
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -36,7 +36,7 @@
3636

3737
<!-- WebView -->
3838
<Border x:Name="WebViewBorder" Grid.Row="2" CornerRadius="6" ClipToBounds="True">
39-
<wv:NativeWebView x:Name="WebViewControl"/>
39+
<controls:UniGetUiWebView x:Name="WebViewControl"/>
4040
</Border>
4141

4242
<!-- Linux fallback -->

0 commit comments

Comments
 (0)