Merge remote-tracking branch 'origin/master' into gi

2022-04-21 12:57:08 +02:00
parent ca935f4f08 3c841b1be1
commit cad9bad950
78 changed files with 604 additions and 311 deletions
--- a/Source/Editor/CustomEditors/LayoutElementsContainer.cs
+++ b/Source/Editor/CustomEditors/LayoutElementsContainer.cs
@@ -279,6 +279,16 @@ namespace FlaxEditor.CustomEditors
            return element;
        }

+        internal LabelElement Header(HeaderAttribute header)
+        {
+            var element = Header(header.Text);
+            if (header.FontSize != -1)
+                element.Label.Font = new FontReference(element.Label.Font.Font, header.FontSize);
+            if (header.Color != 0)
+                element.Label.TextColor = Color.FromRGBA(header.Color);
+            return element;
+        }
+
        /// <summary>
        /// Adds new text box element.
        /// </summary>