From 9363d31909d5f04eccbf977d42a24f01fd9c8a1e Mon Sep 17 00:00:00 2001
From: Bjoern Esswein <692-bessw@users.noreply.gl.kwarc.info>
Date: Wed, 17 Jul 2024 18:11:11 +0200
Subject: [PATCH] Fix parsing the alternative text description for the
scrollDetails view, from the html alt attribute.
---
Assets/Scripts/UI/InGame/ScrollDetails.cs | 2 +-
Assets/Scripts/UI/NetwMenu/StartMenu_mobile.cs | 14 ++++++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/Assets/Scripts/UI/InGame/ScrollDetails.cs b/Assets/Scripts/UI/InGame/ScrollDetails.cs
index c203d684..3c7f26db 100644
--- a/Assets/Scripts/UI/InGame/ScrollDetails.cs
+++ b/Assets/Scripts/UI/InGame/ScrollDetails.cs
@@ -72,7 +72,7 @@ private void ShowScroll(Scroll newScroll)
// if description is a html description, extract the alternative text representation
if (newScroll.description.StartsWith("<scroll-description"))
{
- description = Regex.Match(newScroll.description, "<scroll-description [^>]* alt=([\"']?)(.*)\\1 [^>]*>").Groups[2].Value;
+ description = Regex.Match(newScroll.description, "<scroll-description [^>]* alt=((?>\\\")|(?>\\'))([^>]*?)\\1[^>]*>").Groups[2].Value;
}
originalScroll.GetChild(0).GetComponent<TextMeshProUGUI>().text = description;
diff --git a/Assets/Scripts/UI/NetwMenu/StartMenu_mobile.cs b/Assets/Scripts/UI/NetwMenu/StartMenu_mobile.cs
index 878b339f..264b5dd9 100644
--- a/Assets/Scripts/UI/NetwMenu/StartMenu_mobile.cs
+++ b/Assets/Scripts/UI/NetwMenu/StartMenu_mobile.cs
@@ -210,13 +210,19 @@ void changeSettingsToOS()
{
case OperationSystem.Windows:
UIconfig.controlMode = ControlMode.Keyboard;
- if (autoSettingsAdaption == 2) { UIconfig.FrameITUIversion = 1; }
- UIconfig.scrollViewVersion = ScrollViewVersion.ScrollWebView;
+ if (autoSettingsAdaption == 2)
+ {
+ UIconfig.FrameITUIversion = 1;
+ UIconfig.scrollViewVersion = ScrollViewVersion.ScrollWebView;
+ }
break;
case OperationSystem.Android:
UIconfig.controlMode = ControlMode.Mobile;
- if (autoSettingsAdaption == 2) { UIconfig.FrameITUIversion = 2; }
- UIconfig.scrollViewVersion = ScrollViewVersion.ScrollShow;
+ if (autoSettingsAdaption == 2)
+ {
+ UIconfig.FrameITUIversion = 2;
+ UIconfig.scrollViewVersion = ScrollViewVersion.ScrollShow;
+ }
break;
default:
break;
--
GitLab