Skip to content

Commit

Permalink
map browser edits
Browse files Browse the repository at this point in the history
  • Loading branch information
@rainlizard
rainlizard committed Mar 25, 2024
1 parent e6391da commit a88b522
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 52 deletions.
7 changes: 5 additions & 2 deletions Scenes/DynamicMapTree.gd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ var searchResultTreeItemDirs = [] # Just used for killing items with no children

func _ready():
set_column_expand(0,false)
set_column_min_width(0,135)
set_column_min_width(0,180)


func update_dynamic_tree():
Expand Down Expand Up @@ -54,7 +54,10 @@ func get_tree_items_recursively(fromItem, toItem, searchText, collapseResults):
if fromItem.get_metadata(0).to_upper() in currentSlbPath.to_upper():
newTreeItem.set_collapsed(false)
else:
newTreeItem.set_collapsed(collapseResults)
if toItem == get_root():
newTreeItem.set_collapsed(false) # Do not collapse folders one level deep
else:
newTreeItem.set_collapsed(collapseResults)

searchResultTreeItemDirs.append(newTreeItem)
get_tree_items_recursively(fromItem, newTreeItem, searchText, collapseResults)
Expand Down
85 changes: 35 additions & 50 deletions Scenes/Main.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1823,30 +1823,16 @@ tab_align = 0
[node name="MapBrowserTabEdit" type="Control" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer"]
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = 12.0
margin_top = 43.0
margin_right = -12.0
margin_bottom = -12.0
[node name="PanelContainer" type="PanelContainer" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit"]
[node name="VBoxContainer" type="VBoxContainer" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit"]
anchor_right = 1.0
anchor_bottom = 1.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="VBoxContainer" type="VBoxContainer" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer"]
margin_left = 9.0
margin_top = 9.0
margin_right = 301.0
margin_bottom = 775.0
size_flags_vertical = 3
custom_constants/separation = 0
__meta__ = {
"_edit_use_anchors_": false
}
[node name="LineEditFilter" type="LineEdit" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer/VBoxContainer"]
margin_right = 292.0
[node name="LineEditFilter" type="LineEdit" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/VBoxContainer"]
margin_right = 334.0
margin_bottom = 42.0
focus_mode = 1
mouse_filter = 1
Expand All @@ -1862,9 +1848,9 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="HSeparator" type="HSeparator" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer/VBoxContainer"]
[node name="HSeparator" type="HSeparator" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/VBoxContainer"]
margin_top = 42.0
margin_right = 292.0
margin_right = 334.0
margin_bottom = 50.0
mouse_filter = 1
custom_constants/separation = 8
Expand All @@ -1873,15 +1859,14 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="DynamicMapTree" type="Tree" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer/VBoxContainer"]
[node name="DynamicMapTree" type="Tree" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/VBoxContainer"]
margin_top = 50.0
margin_right = 292.0
margin_bottom = 729.0
margin_right = 334.0
margin_bottom = 802.0
mouse_filter = 1
size_flags_horizontal = 3
size_flags_vertical = 3
custom_constants/draw_relationship_lines = 1
custom_fonts/font = ExtResource( 70 )
columns = 2
allow_reselect = true
hide_root = true
Expand All @@ -1891,7 +1876,7 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="SourceMapTree" type="Tree" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer/VBoxContainer"]
[node name="SourceMapTree" type="Tree" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/VBoxContainer"]
visible = false
margin_top = 297.0
margin_right = 586.0
Expand All @@ -1908,29 +1893,29 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="VBoxContainer" type="VBoxContainer" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer/VBoxContainer"]
margin_top = 729.0
margin_right = 292.0
margin_bottom = 766.0
[node name="VBoxContainer" type="VBoxContainer" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/VBoxContainer"]
margin_top = 802.0
margin_right = 334.0
margin_bottom = 839.0
[node name="MarginContainer" type="MarginContainer" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer/VBoxContainer/VBoxContainer"]
margin_right = 292.0
[node name="MarginContainer" type="MarginContainer" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/VBoxContainer/VBoxContainer"]
margin_right = 334.0
margin_bottom = 37.0
custom_constants/margin_right = 5
custom_constants/margin_top = 5
custom_constants/margin_left = 5
custom_constants/margin_bottom = 5
[node name="HBoxContainer" type="HBoxContainer" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer/VBoxContainer/VBoxContainer/MarginContainer"]
[node name="HBoxContainer" type="HBoxContainer" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/VBoxContainer/VBoxContainer/MarginContainer"]
margin_left = 5.0
margin_top = 5.0
margin_right = 287.0
margin_right = 329.0
margin_bottom = 32.0
__meta__ = {
"_edit_use_anchors_": false
}
[node name="TextureButton" type="TextureButton" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer/VBoxContainer/VBoxContainer/MarginContainer/HBoxContainer"]
[node name="TextureButton" type="TextureButton" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/VBoxContainer/VBoxContainer/MarginContainer/HBoxContainer"]
margin_right = 24.0
margin_bottom = 27.0
rect_min_size = Vector2( 24, 24 )
Expand All @@ -1943,7 +1928,7 @@ texture_hover = ExtResource( 59 )
expand = true
stretch_mode = 5
[node name="UNUSEDLineEditFilename" type="LineEdit" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer/VBoxContainer/VBoxContainer/MarginContainer/HBoxContainer"]
[node name="UNUSEDLineEditFilename" type="LineEdit" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/VBoxContainer/VBoxContainer/MarginContainer/HBoxContainer"]
visible = false
margin_left = 28.0
margin_right = 519.0
Expand All @@ -1960,9 +1945,9 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="BrowserFilename" type="Label" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer/VBoxContainer/VBoxContainer/MarginContainer/HBoxContainer"]
[node name="BrowserFilename" type="Label" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/VBoxContainer/VBoxContainer/MarginContainer/HBoxContainer"]
margin_left = 28.0
margin_right = 229.0
margin_right = 271.0
margin_bottom = 27.0
size_flags_horizontal = 3
size_flags_vertical = 3
Expand All @@ -1973,13 +1958,13 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="BrowseButton" type="Button" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer/VBoxContainer/VBoxContainer/MarginContainer/HBoxContainer"]
margin_left = 233.0
margin_right = 282.0
[node name="BrowseButton" type="Button" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/VBoxContainer/VBoxContainer/MarginContainer/HBoxContainer"]
margin_left = 275.0
margin_right = 324.0
margin_bottom = 27.0
text = "Edit"
[node name="RandomMapContainer" type="MarginContainer" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer/VBoxContainer/VBoxContainer"]
[node name="RandomMapContainer" type="MarginContainer" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/VBoxContainer/VBoxContainer"]
visible = false
margin_top = 41.0
margin_right = 292.0
Expand All @@ -1989,21 +1974,21 @@ custom_constants/margin_top = 5
custom_constants/margin_left = 5
custom_constants/margin_bottom = 5
[node name="HBoxContainer" type="HBoxContainer" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer/VBoxContainer/VBoxContainer/RandomMapContainer"]
[node name="HBoxContainer" type="HBoxContainer" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/VBoxContainer/VBoxContainer/RandomMapContainer"]
margin_left = 5.0
margin_top = 5.0
margin_right = 287.0
margin_bottom = 32.0
[node name="TextureRect" type="TextureRect" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer/VBoxContainer/VBoxContainer/RandomMapContainer/HBoxContainer"]
[node name="TextureRect" type="TextureRect" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/VBoxContainer/VBoxContainer/RandomMapContainer/HBoxContainer"]
margin_right = 27.0
margin_bottom = 27.0
rect_min_size = Vector2( 27, 27 )
size_flags_horizontal = 8
texture = ExtResource( 144 )
expand = true
[node name="PlayRandomMapButton" type="Button" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer/VBoxContainer/VBoxContainer/RandomMapContainer/HBoxContainer"]
[node name="PlayRandomMapButton" type="Button" parent="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/VBoxContainer/VBoxContainer/RandomMapContainer/HBoxContainer"]
margin_left = 111.0
margin_right = 282.0
margin_bottom = 27.0
Expand Down Expand Up @@ -7086,13 +7071,13 @@ script = SubResource( 20 )
[connection signal="item_rect_changed" from="Ui/UiSystem/MapBrowser" to="Ui/UiSystem/MapBrowser" method="_on_MapBrowser_item_rect_changed"]
[connection signal="visibility_changed" from="Ui/UiSystem/MapBrowser" to="Ui/UiSystem/MapBrowser" method="_on_MapBrowser_visibility_changed"]
[connection signal="tab_changed" from="Ui/UiSystem/MapBrowser/MapBrowserTabContainer" to="Ui/UiSystem/MapBrowser" method="_on_MapBrowserTabContainer_tab_changed"]
[connection signal="text_changed" from="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer/VBoxContainer/LineEditFilter" to="Ui/UiSystem/MapBrowser" method="_on_LineEdit_text_changed"]
[connection signal="item_activated" from="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer/VBoxContainer/DynamicMapTree" to="Ui/UiSystem/MapBrowser" method="_on_DynamicMapTree_item_activated"]
[connection signal="item_selected" from="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer/VBoxContainer/DynamicMapTree" to="Ui/UiSystem/MapBrowser" method="_on_DynamicMapTree_item_selected"]
[connection signal="item_selected" from="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer/VBoxContainer/DynamicMapTree" to="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer/VBoxContainer/DynamicMapTree" method="_on_DynamicMapTree_item_selected"]
[connection signal="pressed" from="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer/VBoxContainer/VBoxContainer/MarginContainer/HBoxContainer/TextureButton" to="Ui/UiSystem/MapBrowser" method="_on_TextureButton_pressed"]
[connection signal="pressed" from="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer/VBoxContainer/VBoxContainer/MarginContainer/HBoxContainer/BrowseButton" to="Ui/UiSystem/MapBrowser" method="_on_BrowseButton_pressed"]
[connection signal="pressed" from="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/PanelContainer/VBoxContainer/VBoxContainer/RandomMapContainer/HBoxContainer/PlayRandomMapButton" to="Ui/UiSystem/MapBrowser" method="_on_PlayRandomMapButton_pressed"]
[connection signal="text_changed" from="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/VBoxContainer/LineEditFilter" to="Ui/UiSystem/MapBrowser" method="_on_LineEdit_text_changed"]
[connection signal="item_activated" from="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/VBoxContainer/DynamicMapTree" to="Ui/UiSystem/MapBrowser" method="_on_DynamicMapTree_item_activated"]
[connection signal="item_selected" from="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/VBoxContainer/DynamicMapTree" to="Ui/UiSystem/MapBrowser" method="_on_DynamicMapTree_item_selected"]
[connection signal="item_selected" from="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/VBoxContainer/DynamicMapTree" to="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/VBoxContainer/DynamicMapTree" method="_on_DynamicMapTree_item_selected"]
[connection signal="pressed" from="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/VBoxContainer/VBoxContainer/MarginContainer/HBoxContainer/TextureButton" to="Ui/UiSystem/MapBrowser" method="_on_TextureButton_pressed"]
[connection signal="pressed" from="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/VBoxContainer/VBoxContainer/MarginContainer/HBoxContainer/BrowseButton" to="Ui/UiSystem/MapBrowser" method="_on_BrowseButton_pressed"]
[connection signal="pressed" from="Ui/UiSystem/MapBrowser/MapBrowserTabContainer/MapBrowserTabEdit/VBoxContainer/VBoxContainer/RandomMapContainer/HBoxContainer/PlayRandomMapButton" to="Ui/UiSystem/MapBrowser" method="_on_PlayRandomMapButton_pressed"]
[connection signal="file_selected" from="Ui/UiSystem/ChooseDkExe" to="Ui/UiSystem/ChooseDkExe" method="_on_ChooseDkExe_file_selected"]
[connection signal="file_selected" from="Ui/UiSystem/ChooseDkExe" to="Ui/UiSystem/PreferencesWindow" method="_on_ChooseDkExe_file_selected"]
[connection signal="dir_selected" from="Ui/UiSystem/ChooseDefaultSaveFolder" to="Ui/UiSystem/ChooseDefaultSaveFolder" method="_on_ChooseDefaultSaveFolder_dir_selected"]
Expand Down
Binary file modified Theme/UnearthTheme.theme
View file
Binary file not shown.

0 comments on commit a88b522

Please sign in to comment.