From f7a49e52e0c25a5996a17a09351b45a92ab70911 Mon Sep 17 00:00:00 2001 From: qhy040404 Date: Thu, 1 Feb 2024 00:10:23 +0800 Subject: [PATCH 1/2] fix #1347 --- .../View/Control/AnnouncementContentViewer.xaml.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs index afa1d250..0665a1af 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs @@ -7,6 +7,7 @@ using Microsoft.Web.WebView2.Core; using Snap.Hutao.Control.Extension; using Snap.Hutao.Control.Theme; using Snap.Hutao.Web.Hoyolab.Hk4e.Common.Announcement; +using System.Globalization; using System.Text; using System.Text.RegularExpressions; using Windows.Foundation; @@ -77,6 +78,8 @@ internal sealed partial class AnnouncementContentViewer : UserControl content = StyleRegex().Replace(content, string.Empty); + content = RemRegex().Replace(content, x => $"{double.Parse(x.Groups[1].Value, CultureInfo.InvariantCulture) * 10}rem"); + bool isDarkMode = ThemeHelper.IsDarkMode(theme); if (isDarkMode) @@ -125,6 +128,9 @@ internal sealed partial class AnnouncementContentViewer : UserControl [GeneratedRegex(" style=\"(?!\")*?vertical-align:middle;\"")] private static partial Regex StyleRegex(); + [GeneratedRegex("([0-9]+\\.[0-9]{1,3})rem")] + private static partial Regex RemRegex(); + private void OnLoaded(object sender, RoutedEventArgs e) { LoadAnnouncementAsync().SafeForget(); From b942ceb91482e3c3ead68240ae524703b59eab24 Mon Sep 17 00:00:00 2001 From: Lightczx <1686188646@qq.com> Date: Thu, 1 Feb 2024 09:22:52 +0800 Subject: [PATCH 2/2] codestyle --- .../View/Control/AnnouncementContentViewer.xaml.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs index 0665a1af..e0ca9511 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs @@ -77,8 +77,7 @@ internal sealed partial class AnnouncementContentViewer : UserControl } content = StyleRegex().Replace(content, string.Empty); - - content = RemRegex().Replace(content, x => $"{double.Parse(x.Groups[1].Value, CultureInfo.InvariantCulture) * 10}rem"); + content = RemRegex().Replace(content, "calc($1 * 10) rem"); bool isDarkMode = ThemeHelper.IsDarkMode(theme); @@ -128,7 +127,7 @@ internal sealed partial class AnnouncementContentViewer : UserControl [GeneratedRegex(" style=\"(?!\")*?vertical-align:middle;\"")] private static partial Regex StyleRegex(); - [GeneratedRegex("([0-9]+\\.[0-9]{1,3})rem")] + [GeneratedRegex("([0-9]+\\.[0-9]+)rem")] private static partial Regex RemRegex(); private void OnLoaded(object sender, RoutedEventArgs e)