Unstable 0.17.0.0

2022-02-26 02:43:01 +09:00
parent a83f375681
commit 3974067915
913 changed files with 32472 additions and 32364 deletions
@@ -148,7 +148,11 @@ namespace Barotrauma
        }

        // TODO: fix implicit hiding
-        public bool Selected { get; set; }
+        public override bool Selected
+        {
+            get { return isSelected; }
+            set { isSelected = value; }
+        }

        public IReadOnlyList<GUIComponent> AllSelected => selected;

@@ -328,7 +332,7 @@ namespace Barotrauma
            };
            if (style != null)
            {
-                GUI.Style.Apply(ContentBackground, "", this);
+                GUIStyle.Apply(ContentBackground, "", this);
            }
            if (color.HasValue)
            {
@@ -435,7 +439,7 @@ namespace Barotrauma
            Vector2 topOffset = CalculateTopOffset();
            int x = (int)topOffset.X;
            int y = (int)topOffset.Y;
-            
+
            for (int i = 0; i < Content.CountChildren; i++)
            {
                GUIComponent child = Content.GetChild(i);