Skip to content

Commit 2e5d7dc

Browse files
BenjaTKBenjaTK
committed
Update to 4.6
1 parent 453d088 commit 2e5d7dc

File tree

8 files changed

+92
-159
lines changed

8 files changed

+92
-159
lines changed

‎addons/gaea/editor/graph_editor/graph_edit.gd‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ var is_loading = false
2626
## Reference to the output node
2727
var _output_node: GaeaOutputGraphNode
2828

29-
## Reference to the window popout separator
30-
var _window_popout_separator: VSeparator
31-
32-
## Reference to the window popout button
33-
var _window_popout_button: Button
34-
3529
var _back_icon: Texture2D
3630
var _forward_icon: Texture2D
3731

@@ -185,31 +179,6 @@ func _add_toolbar_buttons() -> void:
185179
about_button.pressed.connect(main_editor.about_popup_request.emit)
186180
container.add_child(about_button)
187181

188-
_window_popout_separator = VSeparator.new()
189-
container.add_child(_window_popout_separator)
190-
191-
_window_popout_button = Button.new()
192-
_window_popout_button.theme_type_variation = &"FlatButton"
193-
_window_popout_button.icon = EditorInterface.get_base_control().get_theme_icon(&"MakeFloating", &"EditorIcons")
194-
_window_popout_button.pressed.connect(main_editor.panel_popout_request.emit)
195-
container.add_child(_window_popout_button)
196-
197-
if not EditorInterface.is_multi_window_enabled():
198-
_window_popout_button.disabled = true
199-
_window_popout_button.tooltip_text = _get_multiwindow_support_tooltip_text()
200-
201-
202-
func _get_multiwindow_support_tooltip_text() -> String:
203-
# Adapted from https://github.com/godotengine/godot/blob/a8598cd8e261716fa3addb6f10bb57c03a061be9/editor/editor_node.cpp#L4725-L4737
204-
var prefix: String = "Multi-window support is not available because"
205-
if EditorInterface.get_editor_settings().get_setting("interface/editor/single_window_mode"):
206-
return tr(prefix + " Interface > Editor > Single Window Mode is enabled in the editor settings.")
207-
if not EditorInterface.get_editor_settings().get_setting("interface/multi_window/enable"):
208-
return tr(prefix + " Interface > Multi Window > Enable is disabled in the editor settings.")
209-
if DisplayServer.has_feature(DisplayServer.FEATURE_SUBWINDOWS):
210-
return tr(prefix + " the `--single-window` command line argument was used to start the editor.")
211-
return tr(prefix + " the current platform doesn't support multiple windows.")
212-
213182

214183
func _add_node_button_pressed() -> void:
215184
main_editor.popup_create_node_request.emit()
@@ -780,12 +749,6 @@ func _on_edited_script_changed(script: Script):
780749
#endregion
781750

782751
#region Utils and misc
783-
@warning_ignore("shadowed_variable_base_class")
784-
func set_window_popout_button_visible(visible: bool) -> void:
785-
_window_popout_button.visible = visible
786-
_window_popout_separator.visible = visible
787-
788-
789752
## This function converts a local position to a grid position based on the current zoom level and scroll offset.
790753
## It also applies snapping if enabled in the GraphEdit.
791754
func local_to_grid(

‎addons/gaea/editor/graph_editor/main_editor.gd‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ signal popup_create_node_and_connect_node_request(node: GaeaGraphNode, type: Gae
1010

1111
signal popup_node_context_menu_at_mouse_request(selected_nodes: Array)
1212
signal popup_link_context_menu_at_mouse_request(connection: Dictionary)
13-
@warning_ignore("unused_signal")
14-
signal panel_popout_request()
1513

1614
signal node_selected_for_creation(resource: GaeaNodeResource)
1715
signal special_node_selected_for_creation(id: StringName)

‎addons/gaea/editor/panel/panel.gd‎

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -16,48 +16,3 @@ static func instantiate() -> Node:
1616
func _ready() -> void:
1717
if is_part_of_edited_scene():
1818
return
19-
20-
main_editor.panel_popout_request.connect(_on_panel_popout_request)
21-
22-
23-
#region Popout Panel Window
24-
func _on_panel_popout_request() -> void:
25-
graph_edit.set_window_popout_button_visible(false)
26-
var window: Window = Window.new()
27-
window.min_size = get_combined_minimum_size()
28-
window.size = size
29-
window.title = "Gaea - Godot Engine"
30-
window.close_requested.connect(_on_window_close_requested.bind(get_parent(), window))
31-
32-
var margin_container: MarginContainer = MarginContainer.new()
33-
margin_container.set_anchors_preset(Control.PRESET_FULL_RECT)
34-
var panel: Panel = Panel.new()
35-
panel.add_theme_stylebox_override(
36-
&"panel",
37-
EditorInterface.get_base_control().get_theme_stylebox(&"PanelForeground", &"EditorStyles")
38-
)
39-
panel.set_anchors_preset(Control.PRESET_FULL_RECT)
40-
panel.mouse_filter = Control.MOUSE_FILTER_IGNORE
41-
panel.z_index -= 1
42-
window.add_child(margin_container)
43-
margin_container.add_sibling(panel)
44-
45-
var margin: int = get_theme_constant(&"base_margin", &"Editor")
46-
margin_container.add_theme_constant_override(&"margin_top", margin)
47-
margin_container.add_theme_constant_override(&"margin_bottom", margin)
48-
margin_container.add_theme_constant_override(&"margin_left", margin)
49-
margin_container.add_theme_constant_override(&"margin_right", margin)
50-
51-
window.position = global_position as Vector2i + DisplayServer.window_get_position()
52-
53-
reparent(margin_container, false)
54-
55-
EditorInterface.get_base_control().add_child(window)
56-
window.popup()
57-
58-
59-
func _on_window_close_requested(original_parent: Control, window: Window) -> void:
60-
graph_edit.set_window_popout_button_visible(true)
61-
reparent(original_parent, false)
62-
window.queue_free()
63-
#endregion

‎addons/gaea/editor/panel/panel.tscn‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=13 format=3 uid="uid://dngytsjlmkfg7"]
1+
[gd_scene format=3 uid="uid://dngytsjlmkfg7"]
22

33
[ext_resource type="Script" uid="uid://dpbmowgfmnxe5" path="res://addons/gaea/editor/panel/panel.gd" id="1_afcqa"]
44
[ext_resource type="Script" uid="uid://bedt1m4gyyvyv" path="res://addons/gaea/editor/graph_editor/graph_edit.gd" id="2_cdav6"]
@@ -14,7 +14,7 @@
1414

1515
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_dhpru"]
1616

17-
[node name="GaeaPanel" type="HSplitContainer" node_paths=PackedStringArray("main_editor", "graph_edit", "file_list")]
17+
[node name="GaeaPanel" type="HSplitContainer" unique_id=458114644 node_paths=PackedStringArray("main_editor", "graph_edit", "file_list")]
1818
custom_minimum_size = Vector2(0, 256)
1919
anchors_preset = 15
2020
anchor_right = 1.0
@@ -26,7 +26,7 @@ main_editor = NodePath("MainEditor")
2626
graph_edit = NodePath("MainEditor/GraphEdit")
2727
file_list = NodePath("FileSystemContainer")
2828

29-
[node name="FileSystemContainer" type="VBoxContainer" parent="." node_paths=PackedStringArray("graph_edit", "main_editor", "menu_bar", "file_list", "context_menu", "file_dialog")]
29+
[node name="FileSystemContainer" type="VBoxContainer" parent="." unique_id=1774839763 node_paths=PackedStringArray("graph_edit", "main_editor", "menu_bar", "file_list", "context_menu", "file_dialog")]
3030
clip_contents = true
3131
custom_minimum_size = Vector2(200, 0)
3232
layout_mode = 2
@@ -38,32 +38,32 @@ file_list = NodePath("FileList")
3838
context_menu = NodePath("FileList/ContextMenu")
3939
file_dialog = NodePath("FileDialog")
4040

41-
[node name="MenuBar" type="MenuBar" parent="FileSystemContainer"]
41+
[node name="MenuBar" type="MenuBar" parent="FileSystemContainer" unique_id=1427158964]
4242
layout_mode = 2
4343
theme_type_variation = &"FlatButton"
4444
script = ExtResource("2_ce5k6")
4545

46-
[node name="File" type="PopupMenu" parent="FileSystemContainer/MenuBar"]
46+
[node name="File" type="PopupMenu" parent="FileSystemContainer/MenuBar" unique_id=301418282]
4747
oversampling_override = 1.0
4848

49-
[node name="RecentFiles" type="PopupMenu" parent="FileSystemContainer/MenuBar/File"]
49+
[node name="RecentFiles" type="PopupMenu" parent="FileSystemContainer/MenuBar/File" unique_id=1961108598]
5050

51-
[node name="FileList" type="ItemList" parent="FileSystemContainer"]
51+
[node name="FileList" type="ItemList" parent="FileSystemContainer" unique_id=1096113334]
5252
layout_mode = 2
5353
size_flags_vertical = 3
5454
allow_reselect = true
5555
allow_rmb_select = true
5656

57-
[node name="ContextMenu" type="PopupMenu" parent="FileSystemContainer/FileList"]
57+
[node name="ContextMenu" type="PopupMenu" parent="FileSystemContainer/FileList" unique_id=1683616150]
5858
script = ExtResource("3_gbl2m")
5959

60-
[node name="FileDialog" type="FileDialog" parent="FileSystemContainer"]
60+
[node name="FileDialog" type="FileDialog" parent="FileSystemContainer" unique_id=930708575]
6161
title = "Save Graph As..."
6262
size = Vector2i(960, 540)
6363
mode_overrides_title = false
6464
filters = PackedStringArray("*.tres;Resource Files")
6565

66-
[node name="MainEditor" type="Control" parent="." node_paths=PackedStringArray("gaea_panel", "graph_edit", "about_window", "create_node_popup", "node_context_menu", "link_context_menu")]
66+
[node name="MainEditor" type="Control" parent="." unique_id=575557215 node_paths=PackedStringArray("gaea_panel", "graph_edit", "about_window", "create_node_popup", "node_context_menu", "link_context_menu")]
6767
layout_mode = 2
6868
size_flags_vertical = 3
6969
script = ExtResource("4_gbl2m")
@@ -74,7 +74,7 @@ create_node_popup = NodePath("CreateNodePopup")
7474
node_context_menu = NodePath("NodeContextMenu")
7575
link_context_menu = NodePath("LinkContextMenu")
7676

77-
[node name="GraphEdit" type="GraphEdit" parent="MainEditor" node_paths=PackedStringArray("main_editor", "bottom_note_label")]
77+
[node name="GraphEdit" type="GraphEdit" parent="MainEditor" unique_id=1709972799 node_paths=PackedStringArray("main_editor", "bottom_note_label")]
7878
visible = false
7979
layout_mode = 1
8080
anchors_preset = 15
@@ -92,7 +92,7 @@ script = ExtResource("2_cdav6")
9292
main_editor = NodePath("..")
9393
bottom_note_label = NodePath("Margin/BottomNote")
9494

95-
[node name="Margin" type="MarginContainer" parent="MainEditor/GraphEdit"]
95+
[node name="Margin" type="MarginContainer" parent="MainEditor/GraphEdit" unique_id=1980547536]
9696
z_index = 50
9797
layout_mode = 1
9898
anchors_preset = 12
@@ -106,7 +106,7 @@ theme_override_constants/margin_top = 5
106106
theme_override_constants/margin_right = 12
107107
theme_override_constants/margin_bottom = 12
108108

109-
[node name="BottomNote" type="RichTextLabel" parent="MainEditor/GraphEdit/Margin"]
109+
[node name="BottomNote" type="RichTextLabel" parent="MainEditor/GraphEdit/Margin" unique_id=1830305295]
110110
layout_mode = 2
111111
mouse_filter = 1
112112
theme_override_styles/normal = SubResource("StyleBoxEmpty_dhpru")
@@ -117,12 +117,12 @@ text = "(0,0)"
117117
fit_content = true
118118
metadata/_edit_use_anchors_ = true
119119

120-
[node name="AboutWindow" parent="MainEditor" node_paths=PackedStringArray("main_editor") instance=ExtResource("9_affj1")]
120+
[node name="AboutWindow" parent="MainEditor" unique_id=1931820040 node_paths=PackedStringArray("main_editor") instance=ExtResource("9_affj1")]
121121
visible = false
122122
exclusive = true
123123
main_editor = NodePath("..")
124124

125-
[node name="CreateNodePopup" type="Window" parent="MainEditor" node_paths=PackedStringArray("main_editor", "create_node_panel", "search_bar", "tool_button", "tool_popup", "create_node_tree", "description_label", "cancel_button")]
125+
[node name="CreateNodePopup" type="Window" parent="MainEditor" unique_id=600413268 node_paths=PackedStringArray("main_editor", "create_node_panel", "search_bar", "tool_button", "tool_popup", "create_node_tree", "description_label", "cancel_button")]
126126
oversampling_override = 1.0
127127
title = "Create Node"
128128
position = Vector2i(0, 36)
@@ -142,7 +142,7 @@ create_node_tree = NodePath("MainContentContainer/VBox/CreateNodeTree")
142142
description_label = NodePath("MainContentContainer/VBox/PanelContainer/DescriptionLabel")
143143
cancel_button = NodePath("MainContentContainer/VBox/HBoxContainer/CancelButton")
144144

145-
[node name="BackgroundContainer" type="MarginContainer" parent="MainEditor/CreateNodePopup"]
145+
[node name="BackgroundContainer" type="MarginContainer" parent="MainEditor/CreateNodePopup" unique_id=1175366127]
146146
anchors_preset = 15
147147
anchor_right = 1.0
148148
anchor_bottom = 1.0
@@ -153,13 +153,13 @@ theme_override_constants/margin_top = -10
153153
theme_override_constants/margin_right = -10
154154
theme_override_constants/margin_bottom = -10
155155

156-
[node name="CreateNodePanel" type="Panel" parent="MainEditor/CreateNodePopup/BackgroundContainer"]
156+
[node name="CreateNodePanel" type="Panel" parent="MainEditor/CreateNodePopup/BackgroundContainer" unique_id=611787607]
157157
layout_mode = 2
158158
size_flags_horizontal = 3
159159
size_flags_vertical = 3
160160
mouse_filter = 2
161161

162-
[node name="MainContentContainer" type="MarginContainer" parent="MainEditor/CreateNodePopup"]
162+
[node name="MainContentContainer" type="MarginContainer" parent="MainEditor/CreateNodePopup" unique_id=1099120221]
163163
anchors_preset = 15
164164
anchor_right = 1.0
165165
anchor_bottom = 1.0
@@ -172,26 +172,26 @@ theme_override_constants/margin_top = 10
172172
theme_override_constants/margin_right = 10
173173
theme_override_constants/margin_bottom = 10
174174

175-
[node name="VBox" type="VBoxContainer" parent="MainEditor/CreateNodePopup/MainContentContainer"]
175+
[node name="VBox" type="VBoxContainer" parent="MainEditor/CreateNodePopup/MainContentContainer" unique_id=213634090]
176176
layout_mode = 2
177177

178-
[node name="SearchContainer" type="HBoxContainer" parent="MainEditor/CreateNodePopup/MainContentContainer/VBox"]
178+
[node name="SearchContainer" type="HBoxContainer" parent="MainEditor/CreateNodePopup/MainContentContainer/VBox" unique_id=1711776170]
179179
layout_mode = 2
180180

181-
[node name="SearchBar" type="LineEdit" parent="MainEditor/CreateNodePopup/MainContentContainer/VBox/SearchContainer"]
181+
[node name="SearchBar" type="LineEdit" parent="MainEditor/CreateNodePopup/MainContentContainer/VBox/SearchContainer" unique_id=1398812158]
182182
layout_mode = 2
183183
size_flags_horizontal = 3
184184
placeholder_text = "Search (Ctrl+Tab to cycle)"
185185
clear_button_enabled = true
186186

187-
[node name="ToolButton" type="Button" parent="MainEditor/CreateNodePopup/MainContentContainer/VBox/SearchContainer"]
187+
[node name="ToolButton" type="Button" parent="MainEditor/CreateNodePopup/MainContentContainer/VBox/SearchContainer" unique_id=531789516]
188188
custom_minimum_size = Vector2(32, 32)
189189
layout_mode = 2
190190
focus_mode = 0
191191
theme_type_variation = &"FlatButton"
192192
icon_alignment = 1
193193

194-
[node name="ToolPopup" type="PopupMenu" parent="MainEditor/CreateNodePopup/MainContentContainer/VBox/SearchContainer/ToolButton"]
194+
[node name="ToolPopup" type="PopupMenu" parent="MainEditor/CreateNodePopup/MainContentContainer/VBox/SearchContainer/ToolButton" unique_id=1499861277]
195195
oversampling_override = 1.0
196196
position = Vector2i(255, 80)
197197
size = Vector2i(108, 62)
@@ -203,43 +203,43 @@ item_1/id = 1
203203
item_2/text = "Reload Tree"
204204
item_2/id = 2
205205

206-
[node name="CreateNodeTree" type="Tree" parent="MainEditor/CreateNodePopup/MainContentContainer/VBox" node_paths=PackedStringArray("main_editor", "description_label")]
206+
[node name="CreateNodeTree" type="Tree" parent="MainEditor/CreateNodePopup/MainContentContainer/VBox" unique_id=705628331 node_paths=PackedStringArray("main_editor", "description_label")]
207207
layout_mode = 2
208208
size_flags_vertical = 3
209209
hide_root = true
210210
script = ExtResource("2_vpeaa")
211211
main_editor = NodePath("../../../..")
212212
description_label = NodePath("../PanelContainer/DescriptionLabel")
213213

214-
[node name="Label" type="Label" parent="MainEditor/CreateNodePopup/MainContentContainer/VBox"]
214+
[node name="Label" type="Label" parent="MainEditor/CreateNodePopup/MainContentContainer/VBox" unique_id=1046983528]
215215
layout_mode = 2
216216
text = "Description"
217217

218-
[node name="PanelContainer" type="PanelContainer" parent="MainEditor/CreateNodePopup/MainContentContainer/VBox"]
218+
[node name="PanelContainer" type="PanelContainer" parent="MainEditor/CreateNodePopup/MainContentContainer/VBox" unique_id=1770195186]
219219
layout_mode = 2
220220

221-
[node name="DescriptionLabel" type="RichTextLabel" parent="MainEditor/CreateNodePopup/MainContentContainer/VBox/PanelContainer"]
221+
[node name="DescriptionLabel" type="RichTextLabel" parent="MainEditor/CreateNodePopup/MainContentContainer/VBox/PanelContainer" unique_id=1423034241]
222222
custom_minimum_size = Vector2(0, 96)
223223
layout_mode = 2
224224
bbcode_enabled = true
225225
text = "Description of the selected node goes here"
226226
autowrap_mode = 2
227227

228-
[node name="HBoxContainer" type="HBoxContainer" parent="MainEditor/CreateNodePopup/MainContentContainer/VBox"]
228+
[node name="HBoxContainer" type="HBoxContainer" parent="MainEditor/CreateNodePopup/MainContentContainer/VBox" unique_id=841707805]
229229
layout_mode = 2
230230
size_flags_vertical = 0
231231

232-
[node name="CreateButton" type="Button" parent="MainEditor/CreateNodePopup/MainContentContainer/VBox/HBoxContainer"]
232+
[node name="CreateButton" type="Button" parent="MainEditor/CreateNodePopup/MainContentContainer/VBox/HBoxContainer" unique_id=97503787]
233233
layout_mode = 2
234234
size_flags_horizontal = 3
235235
text = "Create"
236236

237-
[node name="CancelButton" type="Button" parent="MainEditor/CreateNodePopup/MainContentContainer/VBox/HBoxContainer"]
237+
[node name="CancelButton" type="Button" parent="MainEditor/CreateNodePopup/MainContentContainer/VBox/HBoxContainer" unique_id=1925604259]
238238
layout_mode = 2
239239
size_flags_horizontal = 3
240240
text = "Cancel"
241241

242-
[node name="NodeContextMenu" type="PopupMenu" parent="MainEditor" node_paths=PackedStringArray("main_editor", "graph_edit")]
242+
[node name="NodeContextMenu" type="PopupMenu" parent="MainEditor" unique_id=579747770 node_paths=PackedStringArray("main_editor", "graph_edit")]
243243
oversampling_override = 1.0
244244
size = Vector2i(100, 124)
245245
item_count = 6
@@ -260,7 +260,7 @@ script = ExtResource("4_vtsfx")
260260
main_editor = NodePath("..")
261261
graph_edit = NodePath("../GraphEdit")
262262

263-
[node name="LinkContextMenu" type="PopupMenu" parent="MainEditor" node_paths=PackedStringArray("main_editor")]
263+
[node name="LinkContextMenu" type="PopupMenu" parent="MainEditor" unique_id=1303281965 node_paths=PackedStringArray("main_editor")]
264264
oversampling_override = 1.0
265265
size = Vector2i(106, 100)
266266
item_count = 1

0 commit comments

Comments
 (0)