Remove scene and directly create nodes in _ready()

Author: syntaxerror247

addons/android_device_explorer/device_explorer.gd

@@ -8,9 +8,9 @@ const TMP_DIR := "/data/local/tmp"
 const STORAGE_ROOT := "/storage/emulated/0"
 const PULL_PUSH_TEMP = TMP_DIR + "/godot-device-explorer-plugin"
 
-@onready var tree: Tree = $Tree
-@onready var devices_btn: OptionButton = $HBoxContainer/OptionButton
-@onready var menu_button: MenuButton = $HBoxContainer/MenuButton
+var tree: Tree
+var devices_btn: OptionButton
+var menu_button: MenuButton
 
 var current_device := ""
 var show_all := false
@@ -31,22 +31,31 @@ func _ready() -> void:
 
 
 func _setup_ui() -> void:
-	tree.hide_root = true
-	tree.allow_rmb_select = true
-	tree.item_collapsed.connect(_on_item_collapsed)
-	tree.item_mouse_selected.connect(_on_item_mouse_selected)
+	var hbox := HBoxContainer.new()
+	add_child(hbox)
 
+	devices_btn = OptionButton.new()
+	devices_btn.size_flags_horizontal = Control.SIZE_EXPAND_FILL
 	devices_btn.custom_minimum_size = Vector2(32, 32)
-	devices_btn.selected = -1
 	devices_btn.pressed.connect(_load_devices)
 	devices_btn.item_selected.connect(_on_device_selected)
+	hbox.add_child(devices_btn)
 
+	menu_button = MenuButton.new()
 	menu_button.icon = get_theme_icon("GuiTabMenuHl", "EditorIcons")
 	var popup := menu_button.get_popup()
-	popup.clear()
 	popup.add_check_item("Show Full Filesystem", 0)
 	popup.set_item_checked(0, show_all)
 	popup.id_pressed.connect(_on_menu_item_pressed)
+	hbox.add_child(menu_button)
+	
+	tree = Tree.new()
+	tree.size_flags_vertical = Control.SIZE_EXPAND_FILL
+	tree.hide_root = true
+	tree.allow_rmb_select = true
+	tree.item_collapsed.connect(_on_item_collapsed)
+	tree.item_mouse_selected.connect(_on_item_mouse_selected)
+	add_child(tree)
 
 
 func _on_item_mouse_selected(pos: Vector2, mouse_button_index: int) -> void:

addons/android_device_explorer/device_explorer.tscn

@@ -4,11 +4,10 @@ extends EditorPlugin
 var dock
 
 func _enter_tree():
-	var dock_scene = preload("res://addons/android_device_explorer/device_explorer.tscn").instantiate()
-	
+	var dock_control = preload("res://addons/android_device_explorer/device_explorer.gd").new()
 	dock = EditorDock.new()
-	dock.add_child(dock_scene)
-	dock.title = "Android Device Explorer"
+	dock.add_child(dock_control)
+	dock.title = "Device Explorer"
 	dock.default_slot = EditorDock.DOCK_SLOT_RIGHT_BL
 	dock.available_layouts = EditorDock.DOCK_LAYOUT_VERTICAL | EditorDock.DOCK_LAYOUT_FLOATING
 	add_dock(dock)

addons/android_device_explorer/plugin.gd

@@ -11,7 +11,6 @@ config_version=5
 [application]
 
 config/name="Android Device Explorer"
-run/main_scene="uid://c01i5jf0306r"
 config/features=PackedStringArray("4.6", "GL Compatibility")
 config/icon="res://icon.svg"
 
@@ -20,6 +19,10 @@ config/icon="res://icon.svg"
 window/size/viewport_width=500
 window/size/viewport_height=884
 
+[editor_plugins]
+
+enabled=PackedStringArray("res://addons/android_device_explorer/plugin.cfg")
+
 [physics]
 
 3d/physics_engine="Jolt Physics"