diff --git a/src/OWML.Launcher/OWML.Manifest.json b/src/OWML.Launcher/OWML.Manifest.json index 78a9e37f..f34590eb 100644 --- a/src/OWML.Launcher/OWML.Manifest.json +++ b/src/OWML.Launcher/OWML.Manifest.json @@ -3,7 +3,7 @@ "author": "Alek", "name": "OWML", "uniqueName": "Alek.OWML", - "version": "2.10.1", + "version": "2.10.2", "minGameVersion": "1.1.14.768", "maxGameVersion": "1.1.14.768" } diff --git a/src/OWML.ModHelper.Menus/CustomInputs/OWMLPopupInputMenu.cs b/src/OWML.ModHelper.Menus/CustomInputs/OWMLPopupInputMenu.cs index d3709cf4..09f77af3 100644 --- a/src/OWML.ModHelper.Menus/CustomInputs/OWMLPopupInputMenu.cs +++ b/src/OWML.ModHelper.Menus/CustomInputs/OWMLPopupInputMenu.cs @@ -1,10 +1,8 @@ using System; using UnityEngine.UI; using UnityEngine; -using Steamworks; using UnityEngine.EventSystems; using OWML.Common.Interfaces.Menus; -using OWML.Logging; namespace OWML.ModHelper.Menus.CustomInputs { @@ -53,13 +51,6 @@ public override void Activate() base.Activate(); this.ClearInputFieldText(); this._inputField.ActivateInputField(); - this._inputFieldEventListener.OnSelectEvent += this.OnInputFieldSelect; - this._inputFieldEventListener.OnPointerUpEvent += this.OnPointerUpInInputField; - SteamManager.Instance.OnGamepadTextInputDismissed += this.OnSteamVirtualKeyboardDismissed; - if (SteamManager.Initialized) - { - SteamUserStats.RequestCurrentStats(); - } this._inputField.onValueChanged.AddListener(delegate { this.OnTextFieldChanged(); @@ -90,8 +81,7 @@ protected void OnPointerUpInInputField(PointerEventData eventData, Selectable se protected bool TryOpenVirtualKeyboard() { - this._inputField.ActivateInputField(); - return SteamUtils.IsSteamRunningOnSteamDeck() && SteamUtils.ShowFloatingGamepadTextInput(EFloatingGamepadTextInputMode.k_EFloatingGamepadTextInputModeModeSingleLine, 0, 0, 1280, 370); + return false; } protected void OnSteamVirtualKeyboardDismissed(bool bSubmitted, uint unSubmittedText) @@ -149,9 +139,6 @@ public override void Deactivate(bool keepPreviousMenuVisible = false) }); InputField inputField = this._inputField; inputField.onValidateInput = (InputField.OnValidateInput)Delegate.Remove(inputField.onValidateInput, new InputField.OnValidateInput(this.OnValidateInput)); - this._inputFieldEventListener.OnSelectEvent -= this.OnInputFieldSelect; - this._inputFieldEventListener.OnPointerUpEvent -= this.OnPointerUpInInputField; - SteamManager.Instance.OnGamepadTextInputDismissed -= this.OnSteamVirtualKeyboardDismissed; this._virtualKeyboardOpen = false; } diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/PopupMenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/PopupMenuManager.cs index 749a45eb..32c1e2ff 100644 --- a/src/OWML.ModHelper.Menus/NewMenuSystem/PopupMenuManager.cs +++ b/src/OWML.ModHelper.Menus/NewMenuSystem/PopupMenuManager.cs @@ -226,7 +226,6 @@ public IOWMLPopupInputMenu CreateInputFieldPopup(string message, string placehol popup._confirmButton = oldpopup._confirmButton; popup._rootCanvas = oldpopup._rootCanvas; popup._inputField = oldpopup._inputField; - popup._inputFieldEventListener = oldpopup._inputFieldEventListener; Object.Destroy(oldpopup);