From 5cda6713950d170f4cf434abab9439259db45b07 Mon Sep 17 00:00:00 2001
From: rainlizard <15337628+rainlizard@users.noreply.github.com>
Date: Wed, 1 May 2024 12:36:11 +1000
Subject: [PATCH] 'OnlyOwnership' icons update

---
 Scenes/OnlyOwnership.gd  | 13 ++++++++++++-
 Scenes/OpenMap.gd        |  2 ++
 Scenes/PickSlabWindow.gd |  1 -
 Scenes/Properties.gd     |  2 ++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Scenes/OnlyOwnership.gd b/Scenes/OnlyOwnership.gd
index 8f07e13a..12799d7e 100644
--- a/Scenes/OnlyOwnership.gd
+++ b/Scenes/OnlyOwnership.gd
@@ -2,13 +2,17 @@ extends PanelContainer
 onready var oSelection = Nodelist.list["oSelection"]
 onready var oPickSlabWindow = Nodelist.list["oPickSlabWindow"]
 onready var oCurrentFormat = Nodelist.list["oCurrentFormat"]
+onready var oSlabTabs = Nodelist.list["oSlabTabs"]
 
 var scnOwnerButton = preload("res://Scenes/OnlyOwnershipButton.tscn")
 onready var oSelectedRect = get_node("../../../../Clippy/SelectedRect")
 
-func initialize_grid_items():
+func update_grid_items():
 	var oGridContainer = current_grid_container()
 
+	for i in oGridContainer.get_children():
+		i.free()
+
 	var owner_order
 	if oCurrentFormat.selected == 0: # Classic format
 		owner_order = [0,1,2,3,4,5]
@@ -45,6 +49,13 @@ func initialize_grid_items():
 			8: keeperColourIconPic.texture = preload("res://edited_images/plyrsym_32/symbol_player_orange_std.png")
 		
 		oGridContainer.add_child(id)
+	
+	# Refresh tab by switching away then back
+	if oSlabTabs.get_current_tab_control().name == "OnlyOwnership":
+		var ontab = oSlabTabs.current_tab
+		oSlabTabs.current_tab = ontab-1
+		yield(get_tree(),'idle_frame')
+		oSlabTabs.current_tab = ontab
 
 func _on_OwnerButtonPressed(id):
 	
diff --git a/Scenes/OpenMap.gd b/Scenes/OpenMap.gd
index f6b5c7e7..f17f78d2 100644
--- a/Scenes/OpenMap.gd
+++ b/Scenes/OpenMap.gd
@@ -48,6 +48,7 @@ onready var oGuidelines = Nodelist.list["oGuidelines"]
 onready var oResizeCurrentMapSize = Nodelist.list["oResizeCurrentMapSize"]
 onready var oOwnerSelection = Nodelist.list["oOwnerSelection"]
 onready var oScriptGenerator = Nodelist.list["oScriptGenerator"]
+onready var oOnlyOwnership = Nodelist.list["oOnlyOwnership"]
 
 var TOTAL_TIME_TO_OPEN_MAP
 
@@ -251,6 +252,7 @@ func continue_load_openmap(map):
 	oOwnerSelection.update_ownership_head_icons()
 	oScriptGenerator.update_options_based_on_mapformat()
 	oPickSlabWindow.add_slabs()
+	oOnlyOwnership.update_grid_items()
 	oDynamicMapTree.highlight_current_map()
 	oCurrentMap.set_path_and_title(map)
 	oCamera2D.reset_camera(M.xSize, M.ySize)
diff --git a/Scenes/PickSlabWindow.gd b/Scenes/PickSlabWindow.gd
index 401a73df..ffdd5fc3 100644
--- a/Scenes/PickSlabWindow.gd
+++ b/Scenes/PickSlabWindow.gd
@@ -73,7 +73,6 @@ func update_selection_position():
 func add_slabs():
 	var CODETIME_START = OS.get_ticks_msec()
 	clear_grid()
-	oOnlyOwnership.initialize_grid_items()
 	oSlabStyle.initialize_grid_items()
 	
 	var allSlabIDs = []
diff --git a/Scenes/Properties.gd b/Scenes/Properties.gd
index ceb0bccd..243d999a 100644
--- a/Scenes/Properties.gd
+++ b/Scenes/Properties.gd
@@ -31,6 +31,7 @@ onready var oHBoxOptions = Nodelist.list["oHBoxOptions"]
 onready var oHBoxLandView = Nodelist.list["oHBoxLandView"]
 onready var oHBoxNameID = Nodelist.list["oHBoxNameID"]
 onready var oScriptGenerator = Nodelist.list["oScriptGenerator"]
+onready var oOnlyOwnership = Nodelist.list["oOnlyOwnership"]
 
 const kind_options = {
 	"Solo" : "FREE",
@@ -114,6 +115,7 @@ func set_format_selection(setFormat):
 	oPlacingSettings.update_placing_tab()
 	oInspector.deselect()
 	oOwnerSelection.update_ownership_head_icons()
+	oOnlyOwnership.update_grid_items()
 	oScriptGenerator.update_options_based_on_mapformat()
 
 func refresh_dungeon_style_options():