From 5cc3cf264c767653e25496148dcf029147d00129 Mon Sep 17 00:00:00 2001
From: Lightczx <1686188646@qq.com>
Date: Mon, 18 Mar 2024 17:15:42 +0800
Subject: [PATCH] refactor
---
.../Snap.Hutao/Control/BindingProxy.cs | 4 +---
.../Snap.Hutao/Control/Image/CachedImage.cs | 3 +++
src/Snap.Hutao/Snap.Hutao/Control/Loading.cs | 2 +-
.../Control/Text/DescriptionTextBlock.cs | 10 +---------
.../Control/Text/HtmlDescriptionTextBlock.cs | 1 +
.../Snap.Hutao/Core/Abstraction/ICloneable.cs | 18 ------------------
.../Core/Logging/ConsoleWindowLifeTime.cs | 2 +-
7 files changed, 8 insertions(+), 32 deletions(-)
delete mode 100644 src/Snap.Hutao/Snap.Hutao/Core/Abstraction/ICloneable.cs
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/BindingProxy.cs b/src/Snap.Hutao/Snap.Hutao/Control/BindingProxy.cs
index 9eae7d19..136cdd7b 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/BindingProxy.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/BindingProxy.cs
@@ -13,6 +13,4 @@ namespace Snap.Hutao.Control;
///
[HighQuality]
[DependencyProperty("DataContext", typeof(object))]
-internal sealed partial class BindingProxy : DependencyObject
-{
-}
\ No newline at end of file
+internal sealed partial class BindingProxy : DependencyObject;
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.cs b/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.cs
index caebb559..8b89ac41 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.cs
@@ -21,6 +21,9 @@ internal sealed class CachedImage : Implementation.ImageEx
///
public CachedImage()
{
+ DefaultStyleKey = typeof(CachedImage);
+ DefaultStyleResourceUri = "ms-appx:///Control/Image/CachedImage.xaml".ToUri();
+
IsCacheEnabled = true;
EnableLazyLoading = false;
}
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Loading.cs b/src/Snap.Hutao/Snap.Hutao/Control/Loading.cs
index 2b4027a1..38b6f64a 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Loading.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Loading.cs
@@ -17,7 +17,7 @@ internal class Loading : Microsoft.UI.Xaml.Controls.ContentControl
public Loading()
{
DefaultStyleKey = typeof(Loading);
- DefaultStyleResourceUri = new("ms-appx:///Control/Loading.xaml");
+ DefaultStyleResourceUri = "ms-appx:///Control/Loading.xaml".ToUri();
}
public bool IsLoading
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Text/DescriptionTextBlock.cs b/src/Snap.Hutao/Snap.Hutao/Control/Text/DescriptionTextBlock.cs
index 92b437d6..78de940b 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Text/DescriptionTextBlock.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Text/DescriptionTextBlock.cs
@@ -45,15 +45,7 @@ internal sealed partial class DescriptionTextBlock : ContentControl
private static void OnDescriptionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
TextBlock textBlock = (TextBlock)((DescriptionTextBlock)d).Content;
-
- try
- {
- UpdateDescription(textBlock, MiHoYoSyntaxTree.Parse(SpecialNameHandler.Handle((string)e.NewValue)));
- }
- catch (Exception ex)
- {
- _ = ex;
- }
+ UpdateDescription(textBlock, MiHoYoSyntaxTree.Parse(SpecialNameHandler.Handle((string)e.NewValue)));
}
private static void OnTextStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Text/HtmlDescriptionTextBlock.cs b/src/Snap.Hutao/Snap.Hutao/Control/Text/HtmlDescriptionTextBlock.cs
index b4d680fc..adcc0690 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Text/HtmlDescriptionTextBlock.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Text/HtmlDescriptionTextBlock.cs
@@ -14,6 +14,7 @@ using Windows.UI;
namespace Snap.Hutao.Control.Text;
+// TODO: change the parsing to syntax tree
[DependencyProperty("Description", typeof(string), "", nameof(OnDescriptionChanged))]
[DependencyProperty("TextStyle", typeof(Style), default(Style), nameof(OnTextStyleChanged))]
internal sealed partial class HtmlDescriptionTextBlock : ContentControl
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Abstraction/ICloneable.cs b/src/Snap.Hutao/Snap.Hutao/Core/Abstraction/ICloneable.cs
deleted file mode 100644
index 122130ea..00000000
--- a/src/Snap.Hutao/Snap.Hutao/Core/Abstraction/ICloneable.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Core.Abstraction;
-
-///
-/// 可克隆
-///
-/// 自身类型
-[HighQuality]
-internal interface ICloneable
-{
- ///
- /// 克隆
- ///
- /// 新的克隆
- TSelf Clone();
-}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Logging/ConsoleWindowLifeTime.cs b/src/Snap.Hutao/Snap.Hutao/Core/Logging/ConsoleWindowLifeTime.cs
index d40544eb..a9fa4b12 100644
--- a/src/Snap.Hutao/Snap.Hutao/Core/Logging/ConsoleWindowLifeTime.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Logging/ConsoleWindowLifeTime.cs
@@ -22,7 +22,7 @@ internal sealed class ConsoleWindowLifeTime : IDisposable
HANDLE inputHandle = GetStdHandle(STD_HANDLE.STD_INPUT_HANDLE);
if (GetConsoleMode(inputHandle, out CONSOLE_MODE mode))
{
- mode &= ~CONSOLE_MODE.ENABLE_QUICK_EDIT_MODE;
+ mode &= ~CONSOLE_MODE.ENABLE_VIRTUAL_TERMINAL_PROCESSING;
SetConsoleMode(inputHandle, mode);
}