(eba811de) Unstable 0.9.703.0

2020-02-04 11:54:57 -03:00
parent 15499cb704
commit 08ab6185c4
100 changed files with 2162 additions and 1520 deletions
@@ -75,9 +75,8 @@ namespace Barotrauma
            set { textBlock.TextGetter = value; }
        }

-        // TODO: fix implicit hiding
-        private bool selected;
-        public bool Selected
+        private new bool selected;
+        public new bool Selected
        {
            get
            {
@@ -457,13 +456,13 @@ namespace Barotrauma
            return currPosition != null ? currPosition.Item2 : textBlock.Text.Length;
        }

-        public void Select()
+        public void Select(int forcedCaretIndex = -1)
        {
            if (memento.Current == null)
            {
                memento.Store(Text);
            }
-            CaretIndex = GetCaretIndexFromScreenPos(PlayerInput.MousePosition);
+            CaretIndex = forcedCaretIndex == - 1 ? GetCaretIndexFromScreenPos(PlayerInput.MousePosition) : forcedCaretIndex;
            ClearSelection();
            selected = true;
            GUI.KeyboardDispatcher.Subscriber = this;