(048b753e6) Merge branch 'dev' into human-ai

Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs

@@ -317,10 +317,11 @@ namespace Barotrauma
                 Stretch = true
             };
 
-            new GUIButton(new RectTransform(new Vector2(1.0f, 1.0f), tabButtonHolder.RectTransform), TextManager.Get("MapEntityCategory.All"), style: "GUITabButton")
-            {
-                OnClicked = (btn, userdata) => { ClearFilter(); return true; }
-            };
+            entityCategoryButtons.Add(
+                new GUIButton(new RectTransform(new Vector2(1.0f, 1.0f), tabButtonHolder.RectTransform), TextManager.Get("MapEntityCategory.All"), style: "GUITabButton")
+                {
+                    OnClicked = (btn, userdata) => { entityCategoryButtons.ForEach(b => b.Selected = b == btn); ClearFilter(); return true; }
+                });
 
             foreach (MapEntityCategory category in Enum.GetValues(typeof(MapEntityCategory)))
             {
@@ -337,6 +338,8 @@ namespace Barotrauma
                 });
             }
 
+            GUITextBlock.AutoScaleAndNormalize(entityCategoryButtons.Select(b => b.TextBlock));
+
             entityList = new GUIListBox(new RectTransform(new Vector2(1.0f, 0.9f), entityListHolder.RectTransform, Anchor.BottomCenter))
             {
                 OnSelected = SelectPrefab,
@@ -1494,7 +1497,9 @@ namespace Barotrauma
             ClearFilter();
             foreach (GUIButton button in entityCategoryButtons)
             {
-                button.Selected = (MapEntityCategory)button.UserData == selectedCategory;
+                button.Selected = 
+                    button.UserData != null &&
+                    (MapEntityCategory)button.UserData == selectedCategory;
             }
             
             foreach (GUIComponent child in toggleEntityMenuButton.Children)