Merge remote-tracking branch 'upstream/master' into develop

2026-06-16 09:40:27 -03:00
parent a729269763 06616535f4
commit c1073ff3d2
74 changed files with 1167 additions and 408 deletions
@@ -384,14 +384,14 @@ namespace Barotrauma
            CaretIndex = forcedCaretIndex == - 1 ? textBlock.GetCaretIndexFromScreenPos(PlayerInput.MousePosition) : forcedCaretIndex;
            CalculateCaretPos();
            ClearSelection();
-            bool wasSelected = selected;
-            selected = true;
-            GUI.KeyboardDispatcher.Subscriber = this;
            OnSelected?.Invoke(this, Keys.None);
-            if (!wasSelected && PlaySoundOnSelect && !ignoreSelectSound)
+            if (!selected && PlaySoundOnSelect && !ignoreSelectSound)
            {
                SoundPlayer.PlayUISound(GUISoundType.Select);
            }
+            selected = true;
+            //set this after we've set selected to true -> otherwise the textbox taking keyboard focus will trigger Select again
+            GUI.KeyboardDispatcher.Subscriber = this;
        }

        public void Deselect()