diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Helper/FrameworkElementHelper.cs b/src/Snap.Hutao/Snap.Hutao/Control/Helper/FrameworkElementHelper.cs index 9b001414..45bc1950 100644 --- a/src/Snap.Hutao/Snap.Hutao/Control/Helper/FrameworkElementHelper.cs +++ b/src/Snap.Hutao/Snap.Hutao/Control/Helper/FrameworkElementHelper.cs @@ -11,8 +11,8 @@ public sealed partial class FrameworkElementHelper { private static void OnSquareLengthChanged(DependencyObject dp, DependencyPropertyChangedEventArgs e) { - Microsoft.UI.Xaml.Controls.Control control = (Microsoft.UI.Xaml.Controls.Control)dp; - control.Width = (double)e.NewValue; - control.Height = (double)e.NewValue; + FrameworkElement element = (FrameworkElement)dp; + element.Width = (double)e.NewValue; + element.Height = (double)e.NewValue; } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Helper/InfoBarHelper.cs b/src/Snap.Hutao/Snap.Hutao/Control/Helper/InfoBarHelper.cs new file mode 100644 index 00000000..320b242d --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Control/Helper/InfoBarHelper.cs @@ -0,0 +1,12 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; + +namespace Snap.Hutao.Control.Helper; + +[DependencyProperty("IsTextSelectionEnabled", typeof(bool), false, IsAttached = true, AttachedType = typeof(InfoBar))] +public sealed partial class InfoBarHelper +{ +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/FontStyle.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/FontStyle.xaml index 15dcc105..fd4e6dce 100644 --- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/FontStyle.xaml +++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/FontStyle.xaml @@ -1,4 +1,7 @@ - + ms-appx:///Resource/Font/MiSans-Regular.ttf#MiSans ms-appx:///Resource/Font/CascadiaMono.ttf#Cascadia Mono, ms-appx:///Resource/Font/MiSans-Regular.ttf#MiSans @@ -99,6 +102,7 @@ - + diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/TestPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/TestPage.xaml index c828bcac..d623c4fc 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/TestPage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/TestPage.xaml @@ -32,11 +32,11 @@ - - + + - - + + @@ -57,11 +57,11 @@ - - + + - - + + diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModel.cs index 578a3afd..ee0071ea 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModel.cs @@ -42,7 +42,7 @@ internal sealed partial class DailyNoteViewModel : Abstraction.ViewModel public RuntimeOptions RuntimeOptions { get => runtimeOptions; } - public IWebview2ViewerSource VerifyUrlSource { get => new DailyNoteWebview2ViewerSource(); } + public IWebViewerSource VerifyUrlSource { get => new DailyNoteWebViewerSource(); } /// /// 用户与角色集合 diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteWebview2ViewerSource.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteWebViewerSource.cs similarity index 86% rename from src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteWebview2ViewerSource.cs rename to src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteWebViewerSource.cs index 7732d8b9..1f7ef7f0 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteWebview2ViewerSource.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteWebViewerSource.cs @@ -7,7 +7,7 @@ using Snap.Hutao.Web.Request.QueryString; namespace Snap.Hutao.ViewModel.DailyNote; -internal sealed class DailyNoteWebview2ViewerSource : IWebview2ViewerSource +internal sealed class DailyNoteWebViewerSource : IWebViewerSource { public string GetSource(UserAndUid userAndUid) {