Fix #231 - add toolbar settings to bottom panel using native method

TokisanGames · Nov 5, 2023 · ac9fc8a · ac9fc8a
1 parent c8d7b66
commit ac9fc8a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/project/addons/terrain_3d/editor/components/ui.gd b/project/addons/terrain_3d/editor/components/ui.gd
@@ -44,7 +44,7 @@ func _enter_tree() -> void:
  toolbar_settings.hide()
 
  plugin.add_control_to_container(EditorPlugin.CONTAINER_SPATIAL_EDITOR_SIDE_LEFT, toolbar)
- plugin.add_control_to_bottom(toolbar_settings)
+ plugin.add_control_to_container(EditorPlugin.CONTAINER_SPATIAL_EDITOR_BOTTOM, toolbar_settings)
 
  decal = Decal.new()
  add_child(decal)
@@ -58,7 +58,7 @@ func _enter_tree() -> void:
 
 func _exit_tree() -> void:
  plugin.remove_control_from_container(EditorPlugin.CONTAINER_SPATIAL_EDITOR_SIDE_LEFT, toolbar)
- toolbar_settings.get_parent().remove_child(toolbar_settings)
+ plugin.remove_control_from_container(EditorPlugin.CONTAINER_SPATIAL_EDITOR_BOTTOM, toolbar_settings)
  toolbar.queue_free()
  toolbar_settings.queue_free()
  decal.queue_free()

diff --git a/project/addons/terrain_3d/editor/editor.gd b/project/addons/terrain_3d/editor/editor.gd
@@ -213,14 +213,6 @@ func update_region_grid() -> void:
  region_gizmo.region_size = 1024
  region_gizmo.grid = [Vector2i.ZERO]
 
-
-func add_control_to_bottom(control: Control) -> void:
- add_control_to_container(CONTAINER_SPATIAL_EDITOR_MENU, control)
- var container = control.get_parent().get_parent().get_parent().get_parent()
- control.get_parent().remove_child(control)
- container.add_child(control)
- container.move_child(control, 2)
-
 
 # Signal handlers