Unstable 0.1300.0.7

2021-04-07 15:24:22 +03:00
parent 96b2184811
commit 538c3dbfc3
47 changed files with 246 additions and 103 deletions
@@ -584,6 +584,7 @@ namespace Barotrauma

            if (ToggleOpen)
            {
+                GUIFrame.CanBeFocused = true;
                openState += deltaTime * 5.0f;
                //delete all popup messages when the chatbox is open
                foreach (var popupMsg in popupMessages)
@@ -594,6 +595,7 @@ namespace Barotrauma
            }
            else
            {
+                GUIFrame.CanBeFocused = false;
                openState -= deltaTime * 5.0f;

                int yOffset = 0;
@@ -263,6 +263,8 @@ namespace Barotrauma

        public bool HasColorHighlight => RichTextData != null;

+        public bool OverrideRichTextDataAlpha = true;
+
        public struct ClickableArea
        {
            public RichTextData Data;
@@ -645,10 +647,13 @@ namespace Barotrauma
                    }

                    Font.DrawString(spriteBatch, textToShow, pos, colorToShow, 0.0f, origin, TextScale, SpriteEffects.None, textDepth);
-
                }
                else
                {
+                    if (OverrideRichTextDataAlpha)
+                    {
+                        RichTextData.ForEach(rt => rt.Alpha = currentTextColor.A / 255.0f);
+                    }
                    Font.DrawStringWithColors(spriteBatch, Censor ? censoredText : (Wrap ? wrappedText : text), pos,
                        currentTextColor * (currentTextColor.A / 255.0f), 0.0f, origin, TextScale, SpriteEffects.None, textDepth, RichTextData);
                }
@@ -626,6 +626,9 @@ namespace Barotrauma
        {
            if (Text == null) Text = "";

+            // Prevent alt gr from triggering any of these as that combination is often needed for special characters
+            if (PlayerInput.IsAltDown()) return;
+
            switch (command)
            {
                case '\b' when !Readonly: //backspace
@@ -667,7 +670,10 @@ namespace Barotrauma
                    }
                    break;
                case (char)0x1: // ctrl-a
-                    SelectAll();
+                    if (PlayerInput.IsCtrlDown())
+                    {
+                        SelectAll();
+                    }
                    break;
                case (char)0x1A when !Readonly && !SubEditorScreen.IsSubEditor(): // ctrl-z
                    text = memento.Undo();