(62a89ce6a) Refactor and fix priority calculations. WIP, but should already improve things.

2019-05-16 05:05:53 +03:00
parent d0795791e7
commit ff5a819ad3
25 changed files with 142 additions and 65 deletions
@@ -138,6 +138,8 @@ namespace Barotrauma

        public bool IgnoreLayoutGroups;

+        public bool IgnoreLayoutGroups;
+
        public virtual ScalableFont Font
        {
            get;
@@ -65,6 +65,12 @@ namespace Barotrauma
            Content = new GUILayoutGroup(new RectTransform(new Vector2(0.9f, 0.85f), InnerFrame.RectTransform, Anchor.Center)) { AbsoluteSpacing = 5 };
            Tag = tag;

+            InnerFrame = new GUIFrame(new RectTransform(new Point(width, height), RectTransform, Anchor.Center) { IsFixedSize = false }, style: null);
+            GUI.Style.Apply(InnerFrame, "", this);
+
+            Content = new GUILayoutGroup(new RectTransform(new Vector2(0.9f, 0.85f), InnerFrame.RectTransform, Anchor.Center)) { AbsoluteSpacing = 5 };
+            Tag = tag;
+
            if (height == 0)
            {
                string wrappedText = ToolBox.WrapText(text, Content.Rect.Width, GUI.Font);
@@ -111,6 +111,12 @@ namespace Barotrauma
            return style;
        }

+        public GUIComponentStyle GetComponentStyle(string name)
+        {
+            componentStyles.TryGetValue(name.ToLowerInvariant(), out GUIComponentStyle style);
+            return style;
+        }
+
        public void Apply(GUIComponent targetComponent, string styleName = "", GUIComponent parent = null)
        {
            GUIComponentStyle componentStyle = null;