From 14a09c8b0ef409954a86bab69e0229a8c723a339 Mon Sep 17 00:00:00 2001 From: Billytifft Date: Tue, 17 Nov 2026 12:07:34 -0700 Subject: [PATCH] Implement Civ3 Clean Map and Center Screen map menu options --- C7/Game.cs | 33 +++++++- C7/Game_EmitMessages.cs | 51 ++++++++++++- C7/Map/CityLayer.cs | 17 ++++- C7/Map/HillsLayer.cs | 16 +++- C7/Map/TileAssignmentLayer.cs | 4 +- C7/Map/TileOverlayLayer.cs | 22 ++++++ C7/Map/UnitLayer.cs | 5 ++ C7/MapView.cs | 34 +++++++-- C7/UIElements/CleanMapSettings.cs | 75 +++++++++++++++++++ C7/UIElements/CleanMapSettings.cs.uid | 1 + C7/UIElements/Popups/InteractablePopUp.cs | 7 ++ .../Popups/InteractablePopUpController.cs | 52 +++++++++++++ C7/UIElements/Popups/OptionsPopUp.cs | 6 +- 13 files changed, 307 insertions(+), 16 deletions(-) create mode 100644 C7/UIElements/CleanMapSettings.cs create mode 100644 C7/UIElements/CleanMapSettings.cs.uid diff --git a/C7/Game.cs b/C7/Game.cs index e0ca7c6e0..6534c4f69 100644 --- a/C7/Game.cs +++ b/C7/Game.cs @@ -307,6 +307,7 @@ private void InitializeMapView() { mapView.cameraZoom = (float)1.0; mapView.gridLayer.visible = PreferencesSettings.GetShowGrid(); + mapView.ApplyCleanMapPreferences(); if (!cameraLocation.HasValue) { // Set initial camera location. If the UI controller has any cities, focus on their capital. Otherwise, focus on their @@ -919,6 +920,22 @@ private void HandleKeyboardInput(InputEventKey eventKeyDown) { return; } + if (eventKeyDown.Keycode == Godot.Key.M + && eventKeyDown.IsCommandOrControlPressed() + && eventKeyDown.ShiftPressed + && !eventKeyDown.AltPressed) { + ToggleCleanMap(); + return; + } + + if (eventKeyDown.Keycode == Godot.Key.N + && eventKeyDown.IsCommandOrControlPressed() + && eventKeyDown.ShiftPressed + && !eventKeyDown.AltPressed) { + EmitCleanMapPreferencesSignal(); + return; + } + if (eventKeyDown.Keycode == Godot.Key.F1) { EmitSignal(SignalName.ShowSpecificAdvisor, C7Action.ShowDomesticAdvisor); } @@ -954,8 +971,8 @@ private void HandleKeyboardInput(InputEventKey eventKeyDown) { EmitSignal(SignalName.ShowGameView, C7Action.ShowDemographicsView); } - if (eventKeyDown.Keycode == Godot.Key.C && HasCurrentlySelectedUnit()) { - mapView.centerCameraOnTile(CurrentlySelectedUnit.location); + if (eventKeyDown.Keycode == Godot.Key.C) { + CenterScreenOnActiveUnit(); } if (eventKeyDown.Keycode == Godot.Key.H) { City capital = controller.cities.Find(c => c.IsCapital()); @@ -1037,6 +1054,18 @@ private void ToggleGridCoordinates() { }); } + private void CenterScreenOnActiveUnit() { + if (mapView == null || !HasCurrentlySelectedUnit()) { + return; + } + mapView.centerCameraOnTile(CurrentlySelectedUnit.location); + } + + private void ToggleCleanMap() { + CleanMapSettings.Enabled = !CleanMapSettings.Enabled; + mapView?.ApplyCleanMapPreferences(); + } + private void ToggleCameraZoom() { if (mapView == null) { return; diff --git a/C7/Game_EmitMessages.cs b/C7/Game_EmitMessages.cs index dfbc10a71..6f04d6cab 100644 --- a/C7/Game_EmitMessages.cs +++ b/C7/Game_EmitMessages.cs @@ -780,10 +780,28 @@ public void EmitMapMenuSignal(int selectedOption = 0) { } })); - int zoomPercent = mapView != null ? Mathf.RoundToInt(mapView.cameraZoom * 100) : 100; options.Add(CreateMapMenuToggle( 1, selectedOption, + "Center Screen (C)", + CenterScreenOnActiveUnit)); + + options.Add(CreateMapMenuToggle( + 2, + selectedOption, + $"Clean Map (Ctrl+Shift+M): {(CleanMapSettings.Enabled ? "On" : "Off")}", + ToggleCleanMap)); + + var cleanMapPreferencesBtn = new ButtonAction() { + message = "Clean Map Preferences (Ctrl+Shift+N)", + action = () => EmitCleanMapPreferencesSignal(), + }; + options.Add(cleanMapPreferencesBtn); + + int zoomPercent = mapView != null ? Mathf.RoundToInt(mapView.cameraZoom * 100) : 100; + options.Add(CreateMapMenuToggle( + 4, + selectedOption, $"Zoom (Z): {zoomPercent}%", ToggleCameraZoom)); @@ -807,7 +825,7 @@ public void EmitMapMenuSignal(int selectedOption = 0) { options, Advisor.None, Mood.None, - hSize: 350, + hSize: 400, margins: new Margins(top: 100) ) )); @@ -824,6 +842,35 @@ private ButtonAction CreateMapMenuToggle(int optionIndex, int selectedOption, st }; } + public void EmitCleanMapPreferencesSignal() { + List checkboxOptions = new List(); + foreach (CleanMapOptionDefinition option in CleanMapSettings.Options) { + CleanMapToggle toggle = option.Toggle; + checkboxOptions.Add(new CheckboxOption() { + message = option.Label, + pressed = CleanMapSettings.Get(toggle), + action = value => { + CleanMapSettings.Set(toggle, value); + mapView?.ApplyCleanMapPreferences(); + }, + }); + } + + EmitSignal(SignalName.InteractivePopUp, new ParameterWrapper( + new OptionsPopUp( + controller.id, + "Clean Map Preferences", + null, + new List(), + Advisor.None, + Mood.None, + hSize: 400, + margins: new Margins(top: 100), + checkboxActions: checkboxOptions + ) + )); + } + public void EmitWorldSettingsSignal() { WorldCharacteristics settings = EngineStorage.gameData.worldCharacteristics; int seed = EngineStorage.gameData.seed; diff --git a/C7/Map/CityLayer.cs b/C7/Map/CityLayer.cs index 83f2a6127..1fdb53d4f 100644 --- a/C7/Map/CityLayer.cs +++ b/C7/Map/CityLayer.cs @@ -1,4 +1,6 @@ using System.Collections.Generic; +using System.Linq; +using C7.UIElements; using C7GameData; using Godot; @@ -6,10 +8,23 @@ namespace C7.Map; public class CityLayer : LooseLayer { private Dictionary citySceneLookup = new(); + private bool mapVisible = true; public CityLayer() { } + public void SetMapVisible(bool visible) { + if (mapVisible == visible) { + return; + } + mapVisible = visible; + if (!visible) { + foreach (City city in citySceneLookup.Keys.ToList()) { + EraseCity(city); + } + } + } + public void UpdateAfterCityDestruction(City city) { EraseCity(city); } @@ -22,7 +37,7 @@ private void EraseCity(City city) { } public override void drawObject(LooseView looseView, GameData gameData, Tile tile, Vector2 tileCenter) { - if (tile.cityAtTile is null) { + if (!mapVisible || tile.cityAtTile is null) { return; } diff --git a/C7/Map/HillsLayer.cs b/C7/Map/HillsLayer.cs index f182c68b8..0ca9eb964 100644 --- a/C7/Map/HillsLayer.cs +++ b/C7/Map/HillsLayer.cs @@ -1,3 +1,4 @@ +using C7.UIElements; using C7GameData; using Godot; using static C7GameData.TileRandom; @@ -34,6 +35,8 @@ public HillsLayer() { public override void drawObject(LooseView looseView, GameData gameData, Tile tile, Vector2 tileCenter) { if (!tile.overlayTerrainType.isHilly()) return; + if (CleanMapSettings.IsHiding(CleanMapToggle.HideMountains) && (tile.IsMountains() || tile.IsVolcano())) return; + if (CleanMapSettings.IsHiding(CleanMapToggle.HideHills) && tile.IsHills()) return; int pcxIndex = GetMountainIndex(tile); @@ -47,7 +50,7 @@ public override void drawObject(LooseView looseView, GameData gameData, Tile til if (tile.isSnowCapped) { mountainGraphics = snowMountainTexture; } else { - TerrainType dominantVegetation = GetDominantVegetationNearHillyTile(tile); + TerrainType dominantVegetation = DominantVegetationForHillyTile(tile); if (dominantVegetation.isForest()) { mountainGraphics = forestMountainTexture; } else if (dominantVegetation.isJungle()) { @@ -61,7 +64,7 @@ public override void drawObject(LooseView looseView, GameData gameData, Tile til Rect2 hillsRectangle = new Rect2(column * hillsSize.X, row * hillsSize.Y, hillsSize); Rect2 screenTarget = new Rect2(tileCenter - (float)0.5 * hillsSize + new Vector2(0, -4), hillsSize); ImageTexture hillGraphics; - TerrainType dominantVegetation = GetDominantVegetationNearHillyTile(tile); + TerrainType dominantVegetation = DominantVegetationForHillyTile(tile); if (dominantVegetation.isForest()) { hillGraphics = forestHillsTexture; } else if (dominantVegetation.isJungle()) { @@ -74,7 +77,7 @@ public override void drawObject(LooseView looseView, GameData gameData, Tile til Rect2 volcanoRectangle = new Rect2(column * volcanoSize.X, row * volcanoSize.Y, volcanoSize); Rect2 screenTarget = new Rect2(tileCenter - (float)0.5 * volcanoSize + new Vector2(0, -12), volcanoSize); ImageTexture volcanoGraphics; - TerrainType dominantVegetation = GetDominantVegetationNearHillyTile(tile); + TerrainType dominantVegetation = DominantVegetationForHillyTile(tile); if (dominantVegetation.isForest()) { volcanoGraphics = forestVolcanoTexture; } else if (dominantVegetation.isJungle()) { @@ -87,6 +90,13 @@ public override void drawObject(LooseView looseView, GameData gameData, Tile til } + private TerrainType DominantVegetationForHillyTile(Tile center) { + if (CleanMapSettings.IsHiding(CleanMapToggle.HideForestsJungles)) { + return TerrainType.NONE; + } + return GetDominantVegetationNearHillyTile(center); + } + private TerrainType GetDominantVegetationNearHillyTile(Tile center) { TerrainType northeastType = center.neighbors[TileDirection.NORTHEAST].overlayTerrainType; TerrainType northwestType = center.neighbors[TileDirection.NORTHWEST].overlayTerrainType; diff --git a/C7/Map/TileAssignmentLayer.cs b/C7/Map/TileAssignmentLayer.cs index 36551275f..72154a9d9 100644 --- a/C7/Map/TileAssignmentLayer.cs +++ b/C7/Map/TileAssignmentLayer.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using System.Collections.Generic; +using C7.UIElements; using C7GameData; using Godot; @@ -50,7 +51,8 @@ public override void drawObject(LooseView looseView, GameData gameData, Tile til } // Only draw yields for our citizens. - if (tile.personWorkingTile?.city != city && tile.cityAtTile != city) { + if (CleanMapSettings.IsHiding(CleanMapToggle.HideFoodShieldIcons) + || (tile.personWorkingTile?.city != city && tile.cityAtTile != city)) { return; } diff --git a/C7/Map/TileOverlayLayer.cs b/C7/Map/TileOverlayLayer.cs index ac613063d..9fca86b11 100644 --- a/C7/Map/TileOverlayLayer.cs +++ b/C7/Map/TileOverlayLayer.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using C7.UIElements; using C7Engine; using C7GameData; using Godot; @@ -63,6 +64,10 @@ public override void drawObject(LooseView looseView, GameData gameData, Tile til var improvements = RenderableTerrainImprovements(tile); foreach (TerrainImprovement ti in improvements.OrderBy(ti => ti.zIndex)) { + if (ShouldHideImprovement(ti.key)) { + continue; + } + switch (ti.key) { case IRRIGATION: DrawIrrigation(looseView, tile, screenTarget); @@ -92,6 +97,23 @@ public override void drawObject(LooseView looseView, GameData gameData, Tile til } } + private static bool ShouldHideImprovement(string key) { + if (CleanMapSettings.IsHiding(CleanMapToggle.HideRoadsRailroads) && (key == ROAD || key == RAILROAD)) { + return true; + } + if (CleanMapSettings.IsHiding(CleanMapToggle.HideIrrigation) && key == IRRIGATION) { + return true; + } + if (CleanMapSettings.IsHiding(CleanMapToggle.HidePollution) && (key == POLLUTION || key == CRATERS)) { + return true; + } + if (CleanMapSettings.IsHiding(CleanMapToggle.HideTerrainBuildings) + && key != ROAD && key != RAILROAD && key != IRRIGATION && key != POLLUTION && key != CRATERS) { + return true; + } + return false; + } + private List RenderableTerrainImprovements(Tile tile) { if (EngineStorage.gameData.observerMode) return tile.overlays.GetImprovements().ToList(); diff --git a/C7/Map/UnitLayer.cs b/C7/Map/UnitLayer.cs index 0521023ab..ff0323397 100644 --- a/C7/Map/UnitLayer.cs +++ b/C7/Map/UnitLayer.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using C7.Textures; +using C7.UIElements; using C7GameData; using Godot; @@ -249,6 +250,10 @@ public MapUnit selectUnitToDisplay(LooseView looseView, Tile tile, List } public override void drawObject(LooseView looseView, GameData gameData, Tile tile, Vector2 tileCenter) { + if (CleanMapSettings.IsHiding(CleanMapToggle.HideUnits)) { + return; + } + if (!UnitsVisible(gameData, looseView.mapView.game.controller, tile)) { return; } diff --git a/C7/MapView.cs b/C7/MapView.cs index 6c0a34371..2056ae78e 100644 --- a/C7/MapView.cs +++ b/C7/MapView.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System; using C7.Map; +using C7.UIElements; using Godot; using C7GameData; @@ -68,6 +69,11 @@ public int getRowStartX(int y) { public GridLayer gridLayer { get; private set; } public CityLayer cityLayer { get; private set; } public TileAssignmentLayer tileAssignmentLayer { get; private set; } + public RiverLayer riverLayer { get; private set; } + public ForestLayer forestLayer { get; private set; } + public TileOverlayLayer tileOverlayLayer { get; private set; } + public ResourceLayer resourceLayer { get; private set; } + public BorderLayer borderLayer { get; private set; } const float MIN_SCALE = 0.1f; const float MAX_SCALE = 4.0f; @@ -139,16 +145,21 @@ public MapView(Game game, int mapWidth, int mapHeight, bool wrapHorizontally, bo // be drawn behind cities (which are child nodes). LooseView terrainView = new(this); terrainView.layers.Add(new TerrainLayer()); - terrainView.layers.Add(new RiverLayer()); - terrainView.layers.Add(new ForestLayer()); + this.riverLayer = new RiverLayer(); + terrainView.layers.Add(this.riverLayer); + this.forestLayer = new ForestLayer(); + terrainView.layers.Add(this.forestLayer); terrainView.layers.Add(new MarshLayer()); terrainView.layers.Add(new HillsLayer()); terrainView.layers.Add(new TntLayer()); - terrainView.layers.Add(new TileOverlayLayer()); - terrainView.layers.Add(new ResourceLayer()); + this.tileOverlayLayer = new TileOverlayLayer(); + terrainView.layers.Add(this.tileOverlayLayer); + this.resourceLayer = new ResourceLayer(); + terrainView.layers.Add(this.resourceLayer); this.gridLayer = new GridLayer(); terrainView.layers.Add(this.gridLayer); - terrainView.layers.Add(new BorderLayer()); + this.borderLayer = new BorderLayer(); + terrainView.layers.Add(this.borderLayer); LooseView cityView = new(this); this.cityLayer = new(); @@ -185,6 +196,19 @@ public MapView(Game game, int mapWidth, int mapHeight, bool wrapHorizontally, bo looseViews.Add(otherView); } + public void ApplyCleanMapPreferences() { + this.riverLayer.visible = !CleanMapSettings.IsHiding(CleanMapToggle.HideRiversFloodPlains); + this.forestLayer.visible = !CleanMapSettings.IsHiding(CleanMapToggle.HideForestsJungles); + this.borderLayer.visible = !CleanMapSettings.IsHiding(CleanMapToggle.HideTerritoryBoundaries); + this.resourceLayer.visible = !CleanMapSettings.IsHiding(CleanMapToggle.HideNaturalResources); + this.tileOverlayLayer.visible = + !CleanMapSettings.IsHiding(CleanMapToggle.HideRoadsRailroads) + && !CleanMapSettings.IsHiding(CleanMapToggle.HideIrrigation) + && !CleanMapSettings.IsHiding(CleanMapToggle.HideTerrainBuildings) + && !CleanMapSettings.IsHiding(CleanMapToggle.HidePollution); + this.cityLayer.SetMapVisible(!CleanMapSettings.IsHiding(CleanMapToggle.HideCities)); + } + public override void _Process(double delta) { // Redraw everything. This is necessary so that animations play. Maybe we could only update the unit layer but long term I think it's // better to redraw everything every frame like a typical modern video game. diff --git a/C7/UIElements/CleanMapSettings.cs b/C7/UIElements/CleanMapSettings.cs new file mode 100644 index 000000000..1bb67488a --- /dev/null +++ b/C7/UIElements/CleanMapSettings.cs @@ -0,0 +1,75 @@ +using System.Collections.Generic; +using C7Engine; + +namespace C7.UIElements; + +public enum CleanMapToggle { + HideRiversFloodPlains, + HideMountains, + HideHills, + HideForestsJungles, + HideTerrainBuildings, + HideRoadsRailroads, + HideIrrigation, + HideNaturalResources, + HideFoodShieldIcons, + HidePollution, + HideTerritoryBoundaries, + HideCities, + HideUnits, +} + +public record CleanMapOptionDefinition(CleanMapToggle Toggle, string Label, bool DefaultValue); + +public static class CleanMapSettings { + private const string SectionName = "Clean Map"; + + public static bool Enabled { get; set; } = false; + + public static IReadOnlyList Options { get; } = [ + new(CleanMapToggle.HideRiversFloodPlains, "Hide Rivers/Flood Plains", false), + new(CleanMapToggle.HideMountains, "Hide Mountains", false), + new(CleanMapToggle.HideHills, "Hide Hills", false), + new(CleanMapToggle.HideForestsJungles, "Hide Forests/Jungles", false), + new(CleanMapToggle.HideTerrainBuildings, "Hide Terrain Buildings (Mines, Colonies, etc.)", true), + new(CleanMapToggle.HideRoadsRailroads, "Hide Roads/Railroads", true), + new(CleanMapToggle.HideIrrigation, "Hide Irrigation", true), + new(CleanMapToggle.HideNaturalResources, "Hide Natural Resources", false), + new(CleanMapToggle.HideFoodShieldIcons, "Hide Food/Shield Icons", false), + new(CleanMapToggle.HidePollution, "Hide Pollution", true), + new(CleanMapToggle.HideTerritoryBoundaries, "Hide Territory Boundaries", true), + new(CleanMapToggle.HideCities, "Hide Cities", true), + new(CleanMapToggle.HideUnits, "Hide Units", true), + ]; + + private static readonly Dictionary values = new(); + private static bool loaded = false; + + public static bool IsHiding(CleanMapToggle toggle) { + return Enabled && Get(toggle); + } + + public static bool Get(CleanMapToggle toggle) { + EnsureLoaded(); + return values[toggle]; + } + + public static void Set(CleanMapToggle toggle, bool value) { + EnsureLoaded(); + values[toggle] = value; + C7Settings.SetBool(SectionName, toggle.ToString(), value); + C7Settings.SaveSettings(); + } + + private static void EnsureLoaded() { + if (loaded) { + return; + } + + foreach (CleanMapOptionDefinition option in Options) { + values[option.Toggle] = C7Settings.GetBoolOrDefault( + SectionName, option.Toggle.ToString(), option.DefaultValue); + } + loaded = true; + } +} diff --git a/C7/UIElements/CleanMapSettings.cs.uid b/C7/UIElements/CleanMapSettings.cs.uid new file mode 100644 index 000000000..2484789cf --- /dev/null +++ b/C7/UIElements/CleanMapSettings.cs.uid @@ -0,0 +1 @@ +uid://clxtngi4te7vw diff --git a/C7/UIElements/Popups/InteractablePopUp.cs b/C7/UIElements/Popups/InteractablePopUp.cs index b70225e03..345d10aec 100644 --- a/C7/UIElements/Popups/InteractablePopUp.cs +++ b/C7/UIElements/Popups/InteractablePopUp.cs @@ -22,6 +22,7 @@ public class InteractablePopUp { public LineEditComponent lineEditComponent { get; init; } public int contollerEraIndex { get; init; } = 0; public List buttonActions { get; init; } + public List checkboxActions { get; init; } public bool hasConfirm { get; init; } public bool hasCancel { get; init; } @@ -47,6 +48,12 @@ public class ButtonAction { public bool pressed { get; set; } = false; } +public class CheckboxOption { + public string message { get; init; } + public Action action { get; init; } + public bool pressed { get; init; } +} + public class LineEditComponent { public string label; public string placeholderText; diff --git a/C7/UIElements/Popups/InteractablePopUpController.cs b/C7/UIElements/Popups/InteractablePopUpController.cs index 678d9e5ea..7656a6302 100644 --- a/C7/UIElements/Popups/InteractablePopUpController.cs +++ b/C7/UIElements/Popups/InteractablePopUpController.cs @@ -44,6 +44,10 @@ public partial class InteractablePopUpController : Control { private LineEditComponent lineEditComponent; + private MarginContainer checkboxContainer; + private VBoxContainer checkboxList; + private readonly List<(Civ3Checkbox checkbox, CheckboxOption option)> activeCheckboxes = new(); + private float defaultOffsetTop; private float defaultOffsetBottom; private float defaultOffsetLeft; @@ -78,6 +82,7 @@ public override void _Ready() { this.SetUpConfirmButton(); this.SetUpCancelButton(); + this.SetUpCheckboxContainer(); this.confirm.Pressed += this.OnConfirm; this.cancel.Pressed += this.OnCancel; @@ -170,6 +175,21 @@ private async void OnShowInteractablePopUpLocked(InteractablePopUp value) { this.lineEdit.GrabFocus(); } + if (value.checkboxActions is { Count: > 0 }) { + this.checkboxContainer.Show(); + foreach (CheckboxOption option in value.checkboxActions) { + Civ3Checkbox checkbox = new() { + Text = option.message, + FontSize = 14, + ButtonPressed = option.pressed, + }; + this.checkboxList.AddChild(checkbox); + this.activeCheckboxes.Add((checkbox, option)); + } + } else { + this.checkboxContainer.Hide(); + } + if (value.buttonActions is { Count: > 0 }) { this.buttonContainer.Show(); buttonGroup = new ButtonGroup(); @@ -244,6 +264,9 @@ private void Toggle(BaseButton button, Action action) { } private void Cycle(bool forward = true) { + if (buttonGroup == null) { + return; + } var btns = buttonGroup.GetButtons(); if (btns.Count < 1) { return; @@ -281,6 +304,10 @@ private void OnConfirm() { this.lineEditComponent.callback.Invoke(this.lineEdit.Text.StripEdges()); } + foreach ((Civ3Checkbox checkbox, CheckboxOption option) in this.activeCheckboxes) { + option.action?.Invoke(checkbox.ButtonPressed); + } + this.audioManager.PlayUIAudio("buttons.button_ok"); this.Hide(); this.CloseAndDelete(); @@ -310,6 +337,22 @@ private void OnCancel() { new MsgUiDisengaged().send(); } + private void SetUpCheckboxContainer() { + this.checkboxList = new VBoxContainer(); + this.checkboxList.AddThemeConstantOverride("separation", 4); + + this.checkboxContainer = new MarginContainer(); + this.checkboxContainer.AddThemeConstantOverride("margin_left", 30); + this.checkboxContainer.AddThemeConstantOverride("margin_top", 5); + this.checkboxContainer.AddThemeConstantOverride("margin_right", 10); + this.checkboxContainer.AddThemeConstantOverride("margin_bottom", 5); + this.checkboxContainer.AddChild(this.checkboxList); + this.checkboxContainer.Hide(); + + this.mainBgContainer.AddChild(this.checkboxContainer); + this.mainBgContainer.MoveChild(this.checkboxContainer, this.buttons.GetIndex()); + } + private void CloseAndDelete() { this.Hide(); @@ -329,6 +372,15 @@ private void CloseAndDelete() { this.lineEditContainer.Hide(); this.lineEditComponent = null; + this.checkboxContainer?.Hide(); + if (this.checkboxList != null) { + foreach (Node child in this.checkboxList.GetChildren()) { + this.checkboxList.RemoveChild(child); + child.QueueFree(); + } + } + this.activeCheckboxes.Clear(); + foreach (var child in buttonContainer.GetChildren()) { buttonContainer.RemoveChild(child); child.QueueFree(); diff --git a/C7/UIElements/Popups/OptionsPopUp.cs b/C7/UIElements/Popups/OptionsPopUp.cs index 859cc6af2..2a96b28ea 100644 --- a/C7/UIElements/Popups/OptionsPopUp.cs +++ b/C7/UIElements/Popups/OptionsPopUp.cs @@ -16,7 +16,8 @@ public class OptionsPopUp : InformationPopup { public OptionsPopUp( ID controllerId, string header, string message, List options, Advisor advisor, Mood mood, int hSize = 400, - LayoutPreset layoutPreset = DEFAULT_LAYOUT_PRESET, Margins margins = null) + LayoutPreset layoutPreset = DEFAULT_LAYOUT_PRESET, Margins margins = null, + List checkboxActions = null) : base(controllerId, header, message, advisor, mood, hSize, layoutPreset, margins) { var btnGroup = new ButtonGroup(); @@ -33,11 +34,12 @@ public OptionsPopUp( } // Fall back to the first row when the caller doesn't preselect one - if (!optionsList.Any(option => option.pressed)) { + if (optionsList.Count > 0 && !optionsList.Any(option => option.pressed)) { optionsList.First().pressed = true; } this.buttonActions = optionsList; + this.checkboxActions = checkboxActions; this.hasConfirm = true; this.hasCancel = true;