refactor settings again (part 1)

1 files changed, 4 insertions, 39 deletions

diff --git a/client/menu/settings.gd b/client/menu/settings.gd
index eb143900..b47331c6 100644
--- a/client/menu/settings.gd
+++ b/client/menu/settings.gd
@@ -16,52 +16,17 @@
 #
 extends Menu
 
-const SETTINGS_ROW_SCENE = preload("res://menu/settings/settings_row.tscn") 
-
-@onready var settings_tabs: TabContainer = $OuterGap/Panel/InnerGap/VBoxContainer/TabContainer 
+@onready var container = $OuterGap/Panel/InnerGap/VBoxContainer
 
 func _ready():
 	super()
-	update_rows()
+	Global.settings_tree._update_row()
+	container.add_child(Global.settings_tree.row)
+	container.move_child(Global.settings_tree.row, 1)
 
 func _on_back_pressed():
 	exit()
 
 func exit():
 	Global.save_settings()
-	Global.apply_settings()
 	super()
-
-func update_rows(fix_focus = false):
-	for c in settings_tabs.get_children():
-		c.queue_free()
-	
-	for category: SettingsCategory in Global.default_settings:
-		var category_settings = category.settings
-		var scroll := ScrollContainerCustom.new()
-		var options := VBoxContainer.new()
-		scroll.name = category.name
-		scroll.size_flags_horizontal = Control.SIZE_EXPAND_FILL
-		settings_tabs.add_child(scroll)
-		options.size_flags_horizontal = Control.SIZE_EXPAND_FILL
-		scroll.add_child(options)
-		
-		var category_presets = category.presets
-		if category_presets != null:
-			for i: Preset in category_presets:
-				var row: SettingsRow = SETTINGS_ROW_SCENE.instantiate()
-				options.add_child(row)
-				row.label.text = i.label
-				row.reset_button.visible = false
-				for b in i.buttons():
-					row.value_parent.add_child(b)
-		
-		for k: String in category_settings.keys():
-			var row: SettingsRow = Global.settings[k].get_row()
-			options.add_child(row)
-	
-	if fix_focus:
-		pass
-		# TODO: Not implemented!
-		# await get_tree().process_frame
-		# Global.focus_first(self)