> Added fade out if input field text is "" > Switched from resetting position if out of bounds to "border" (SubnauticaNitrox#1056)

Jannify · web-flow · commit 11f7615fab49 · 2020-04-23T00:11:40.000-07:00
diff --git a/AssetBundles/chatlog b/AssetBundles/chatlog
diff --git a/NitroxClient/MonoBehaviours/Gui/Chat/PlayerChat.cs b/NitroxClient/MonoBehaviours/Gui/Chat/PlayerChat.cs
@@ -13,7 +13,7 @@ public class PlayerChat : uGUI_InputGroup
         private const int LINE_CHAR_LIMIT = 255;
         private const int MESSAGES_LIMIT = 64;
         private const float TOGGLED_TRANSPARENCY = 0.4f;
-        public const float CHAT_VISIBILITY_TIME_LENGTH = 10f;
+        public const float CHAT_VISIBILITY_TIME_LENGTH = 6f;
 
         private static readonly Queue<ChatLogEntry> entries = new Queue<ChatLogEntry>();
         private Image[] backgroundImages;
@@ -37,7 +37,6 @@ public IEnumerator SetupChatComponents()
             playerChatManager = NitroxServiceLocator.LocateService<PlayerChatManager>();
 
             canvasGroup = GetComponent<CanvasGroup>();
-            GetComponentsInChildren<HorizontalOrVerticalLayoutGroup>();
 
             logEntryPrefab = GameObject.Find("ChatLogEntryPrefab");
             logEntryPrefab.AddComponent<PlayerChatLogItem>();
diff --git a/NitroxClient/MonoBehaviours/Gui/Chat/PlayerChatInputField.cs b/NitroxClient/MonoBehaviours/Gui/Chat/PlayerChatInputField.cs
@@ -45,8 +45,9 @@ private void Update()
                 return;
             }
 
-            if (selected)
+            if (selected && InputField.text != "")
             {
+                ResetTimer();
                 if (UnityEngine.Input.GetKey(KeyCode.Return))
                 {
                     if (UnityEngine.Input.GetKey(KeyCode.LeftShift))
diff --git a/NitroxClient/MonoBehaviours/Gui/Chat/PlayerChatPinButton.cs b/NitroxClient/MonoBehaviours/Gui/Chat/PlayerChatPinButton.cs
@@ -9,19 +9,24 @@ public class PlayerChatPinButton : MonoBehaviour, IPointerDownHandler, IPointerU
     {
         private static PlayerChatManager playerChatManager;
 
-        private Vector2 screenRes = new Vector2(1920, 1200);
+        private readonly Camera mainCamera = Camera.main;
+        private Vector2 screenRes = new Vector2(1920f, 1200f);
+        private Vector2 chatSize;
+        private Vector4 screenBorder;
         private Vector2 offset;
         private bool drag;
 
         private void Awake()
         {
             playerChatManager = NitroxServiceLocator.LocateService<PlayerChatManager>();
+            chatSize = transform.parent.parent.GetComponent<RectTransform>().sizeDelta;
         }
 
         public void OnPointerDown(PointerEventData eventData)
         {
             screenRes.y = (screenRes.x / Screen.width) * Screen.height;
-            offset = GetMouseWorldPostion() - (Vector2)playerChatManager.PlayerChaTransform.localPosition;
+            offset = GetMouseWorldPosition() - (Vector2)playerChatManager.PlayerChaTransform.localPosition;
+            screenBorder = new Vector4(-(screenRes.x - chatSize.x) / 2f, (screenRes.x - chatSize.x) / 2f, -(screenRes.y - chatSize.y) / 2f, (screenRes.y - chatSize.y) / 2f);
 
             drag = true;
             PlayerChatInputField.FreezeTime = true;
@@ -32,25 +37,30 @@ public void OnPointerUp(PointerEventData eventData)
             drag = false;
             PlayerChatInputField.FreezeTime = false;
             PlayerChatInputField.ResetTimer();
-
-            if (Mathf.Abs(playerChatManager.PlayerChaTransform.localPosition.x * 2) >= screenRes.x || Mathf.Abs(playerChatManager.PlayerChaTransform.localPosition.y * 2) >= screenRes.y)
-            {
-                playerChatManager.PlayerChaTransform.localPosition = new Vector3(-500, 125, 0);
-            }
         }
 
-        private void FixedUpdate()
+        private void Update()
         {
             if (drag)
             {
-                playerChatManager.PlayerChaTransform.localPosition = GetMouseWorldPostion() - offset;
+                playerChatManager.PlayerChaTransform.localPosition = GetChatPosition();
             }
         }
 
-        private Vector2 GetMouseWorldPostion()
+        private Vector2 GetMouseWorldPosition()
+        {
+            Vector3 position = mainCamera.ScreenToViewportPoint(UnityEngine.Input.mousePosition);
+            position.x = (position.x - 0.5f) * screenRes.x;
+            position.y = (position.y - 0.5f) * screenRes.y;
+            return position;
+        }
+
+        private Vector2 GetChatPosition()
         {
-            Vector3 viewport = Camera.main.ScreenToViewportPoint(UnityEngine.Input.mousePosition);
-            return new Vector2((viewport.x - 0.5f) * screenRes.x, (viewport.y - 0.5f) * screenRes.y);
+            Vector2 position = GetMouseWorldPosition() - offset;
+            position.x = Mathf.Clamp(position.x, screenBorder.x, screenBorder.y);
+            position.y = Mathf.Clamp(position.y, screenBorder.z, screenBorder.w);
+            return position;
         }
     }
 }
diff --git a/NitroxUnity/Assets/chatlog/chatlog.unity b/NitroxUnity/Assets/chatlog/chatlog.unity
@@ -281,7 +281,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 65}
-  m_SizeDelta: {x: 0, y: -65}
+  m_SizeDelta: {x: 0, y: -90}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &123268637
 CanvasRenderer:
@@ -887,8 +887,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: -12.5}
+  m_SizeDelta: {x: 0, y: -25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &585940677
 MonoBehaviour:
@@ -963,8 +963,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -700, y: -75}
-  m_SizeDelta: {x: 450, y: 375}
+  m_AnchoredPosition: {x: -700, y: -50}
+  m_SizeDelta: {x: 450, y: 400}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!225 &695062224
 CanvasGroup:
@@ -1448,8 +1448,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 12.499939}
-  m_SizeDelta: {x: 0, y: 25}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1496498126
 MonoBehaviour:

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,9 @@ private void Update()`
`45`	`45`	`return;`
`46`	`46`	`}`
`47`	`47`
`48`		`- if (selected)`
	`48`	`+ if (selected && InputField.text != "")`
`49`	`49`	`{`
	`50`	`+ ResetTimer();`
`50`	`51`	`if (UnityEngine.Input.GetKey(KeyCode.Return))`
`51`	`52`	`{`
`52`	`53`	`if (UnityEngine.Input.GetKey(KeyCode.LeftShift))`
Original file line number	Diff line number	Diff line change
`@@ -9,19 +9,24 @@ public class PlayerChatPinButton : MonoBehaviour, IPointerDownHandler, IPointerU`
`9`	`9`	`{`
`10`	`10`	`private static PlayerChatManager playerChatManager;`
`11`	`11`
`12`		`- private Vector2 screenRes = new Vector2(1920, 1200);`
	`12`	`+ private readonly Camera mainCamera = Camera.main;`
	`13`	`+ private Vector2 screenRes = new Vector2(1920f, 1200f);`
	`14`	`+ private Vector2 chatSize;`
	`15`	`+ private Vector4 screenBorder;`
`13`	`16`	`private Vector2 offset;`
`14`	`17`	`private bool drag;`
`15`	`18`
`16`	`19`	`private void Awake()`
`17`	`20`	`{`
`18`	`21`	`playerChatManager = NitroxServiceLocator.LocateService<PlayerChatManager>();`
	`22`	`+ chatSize = transform.parent.parent.GetComponent<RectTransform>().sizeDelta;`
`19`	`23`	`}`
`20`	`24`
`21`	`25`	`public void OnPointerDown(PointerEventData eventData)`
`22`	`26`	`{`
`23`	`27`	`screenRes.y = (screenRes.x / Screen.width) * Screen.height;`
`24`		`- offset = GetMouseWorldPostion() - (Vector2)playerChatManager.PlayerChaTransform.localPosition;`
	`28`	`+ offset = GetMouseWorldPosition() - (Vector2)playerChatManager.PlayerChaTransform.localPosition;`
	`29`	`+ screenBorder = new Vector4(-(screenRes.x - chatSize.x) / 2f, (screenRes.x - chatSize.x) / 2f, -(screenRes.y - chatSize.y) / 2f, (screenRes.y - chatSize.y) / 2f);`
`25`	`30`
`26`	`31`	`drag = true;`
`27`	`32`	`PlayerChatInputField.FreezeTime = true;`
`@@ -32,25 +37,30 @@ public void OnPointerUp(PointerEventData eventData)`
`32`	`37`	`drag = false;`
`33`	`38`	`PlayerChatInputField.FreezeTime = false;`
`34`	`39`	`PlayerChatInputField.ResetTimer();`
`35`		`-`
`36`		`- if (Mathf.Abs(playerChatManager.PlayerChaTransform.localPosition.x * 2) >= screenRes.x \|\| Mathf.Abs(playerChatManager.PlayerChaTransform.localPosition.y * 2) >= screenRes.y)`
`37`		`- {`
`38`		`- playerChatManager.PlayerChaTransform.localPosition = new Vector3(-500, 125, 0);`
`39`		`- }`
`40`	`40`	`}`
`41`	`41`
`42`		`- private void FixedUpdate()`
	`42`	`+ private void Update()`
`43`	`43`	`{`
`44`	`44`	`if (drag)`
`45`	`45`	`{`
`46`		`- playerChatManager.PlayerChaTransform.localPosition = GetMouseWorldPostion() - offset;`
	`46`	`+ playerChatManager.PlayerChaTransform.localPosition = GetChatPosition();`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`		`- private Vector2 GetMouseWorldPostion()`
	`50`	`+ private Vector2 GetMouseWorldPosition()`
	`51`	`+ {`
	`52`	`+ Vector3 position = mainCamera.ScreenToViewportPoint(UnityEngine.Input.mousePosition);`
	`53`	`+ position.x = (position.x - 0.5f) * screenRes.x;`
	`54`	`+ position.y = (position.y - 0.5f) * screenRes.y;`
	`55`	`+ return position;`
	`56`	`+ }`
	`57`	`+`
	`58`	`+ private Vector2 GetChatPosition()`
`51`	`59`	`{`
`52`		`- Vector3 viewport = Camera.main.ScreenToViewportPoint(UnityEngine.Input.mousePosition);`
`53`		`- return new Vector2((viewport.x - 0.5f) * screenRes.x, (viewport.y - 0.5f) * screenRes.y);`
	`60`	`+ Vector2 position = GetMouseWorldPosition() - offset;`
	`61`	`+ position.x = Mathf.Clamp(position.x, screenBorder.x, screenBorder.y);`
	`62`	`+ position.y = Mathf.Clamp(position.y, screenBorder.z, screenBorder.w);`
	`63`	`+ return position;`
`54`	`64`	`}`
`55`	`65`	`}`
`56`	`66`	`}`