From bd9632f4f6de10fbba73ca5baffbf9f202571f98 Mon Sep 17 00:00:00 2001 From: Aigio Liu Date: Tue, 11 May 2021 15:04:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E9=83=A8=E5=88=86=20toast?= =?UTF-8?q?=20=E6=B2=A1=E6=9C=89=E6=AD=A3=E7=A1=AE=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Application/UI/Views/Windows/WebView3Window.axaml | 6 +++--- .../Application/UI/Views/Windows/WebView3Window.axaml.cs | 4 ++-- .../UI/ViewModels/Windows/LoginOrRegisterWindowViewModel.cs | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/WebView3Window.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/WebView3Window.axaml index 112e308c3..7032c4c6d 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/WebView3Window.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/WebView3Window.axaml @@ -7,9 +7,9 @@ xmlns:ms="clr-namespace:System.Application.Models.Settings;assembly=System.Application.SteamTools.Client.Desktop" FontFamily="{ReflectionBinding Source={x:Static ms:UISettings.FontName},Path=Value, Mode=OneWay,Converter={StaticResource NameToFontFamilyConverter}}" mc:Ignorable="d" - d:DesignWidth="800" d:DesignHeight="600" - Width="800" Height="600" - MinWidth="600" MinHeight="600" + d:DesignWidth="800" d:DesignHeight="500" + Width="800" Height="500" + MinWidth="500" MinHeight="500" Background="{x:Null}" x:Class="System.Application.UI.Views.Windows.WebView3Window" x:DataType="vm:WebView3WindowViewModel" diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/WebView3Window.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/WebView3Window.axaml.cs index eabdf885b..7e3ccd2b1 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/WebView3Window.axaml.cs +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/WebView3Window.axaml.cs @@ -256,9 +256,9 @@ namespace System.Application.UI.Views.Windows } } - protected override void OnInitialized() + protected override void OnOpened(EventArgs e) { - base.OnInitialized(); + base.OnOpened(e); if (loginUsingSteamClientState == LoginUsingSteamClientState.Loading) { Toast.Show(AppResources.GetLoginUsingSteamClientCookies); diff --git a/src/ST.Client.Desktop/UI/ViewModels/Windows/LoginOrRegisterWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/LoginOrRegisterWindowViewModel.cs index beba1f540..4af1c4312 100644 --- a/src/ST.Client.Desktop/UI/ViewModels/Windows/LoginOrRegisterWindowViewModel.cs +++ b/src/ST.Client.Desktop/UI/ViewModels/Windows/LoginOrRegisterWindowViewModel.cs @@ -105,9 +105,9 @@ namespace System.Application.UI.ViewModels static async Task SuccessAsync(LoginOrRegisterResponse rsp, Action? close) { await UserService.Current.RefreshUserAsync(); + close?.Invoke(); var msg = AppResources.Success_.Format((rsp?.IsLoginOrRegister ?? false) ? AppResources.User_Login : AppResources.User_Register); Toast.Show(msg); - close?.Invoke(); } public void ChangeLoginState(short state) @@ -158,9 +158,9 @@ namespace System.Application.UI.ViewModels { MainThreadDesktop.BeginInvokeOnMainThread(() => { - conn_helper.ShowResponseErrorMessage(response); close?.Invoke(); vm?.Close?.Invoke(); + conn_helper.ShowResponseErrorMessage(response); }); } }