diff --git a/.gitattributes b/.gitattributes index 6d8e5c2..5dea781 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,10 @@ +# Normalize EOL for all files that Git considers text files. +* text=auto eol=lf + +# Exclude folders from the generated ZIP (for Godot AssetLib). /images export-ignore /.gitattributes export-ignore /.gitignore export-ignore /LICENSE export-ignore /README.md export-ignore -/project.godot export-ignore \ No newline at end of file +/project.godot export-ignore diff --git a/.gitignore b/.gitignore index 328b3e3..bb93fea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,39 @@ -# Godot -.import -.patches/ +### Godot-specific ignores ### .godot/ +*.tmp +android/ + + +### IDEs and code editors ### + +# Visual Studio Code +.vscode/ +*.code-workspace +.history/ + + +### Operating systems ### + +# Linux +*~ +.directory + +# macOS +.DS_Store +__MACOSX + +# Windows +# https://github.com/github/gitignore/blob/main/Global/Windows.gitignore +[Tt]humbs.db +[Tt]humbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db +*.stackdump +[Dd]esktop.ini +$RECYCLE.BIN/ +*.cab +*.msi +*.msix +*.msm +*.msp +*.lnk diff --git a/README.md b/README.md index 1ba8c07..57229f8 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Godot Editor Theme Explorer Editor plugin which allows plugin developers to quickly reference various `Theme` properties defined in the main Editor Theme. This allows creators to make GUI for their plugins as seamless as possible, relying on style definitions made by Godot Engine developers and giving their users a consistent look across the board. -Developed in and tested against Godot 4.2. For the version compatible with Godot 4.0/4.1 see the `4.0` branch. +Developed in and tested against Godot 4.2/4.3. For the version compatible with Godot 4.0/4.1 see the `4.0` branch. ## Installation Clone this repository or download it as ZIP. You only need to put `addons/explore-editor-theme` folder inside your project folder. ZIP already has only necessary files. diff --git a/addons/explore-editor-theme/ExplorerDialog.tscn b/addons/explore-editor-theme/ExplorerDialog.tscn index 80eca2b..6dfe255 100644 --- a/addons/explore-editor-theme/ExplorerDialog.tscn +++ b/addons/explore-editor-theme/ExplorerDialog.tscn @@ -38,22 +38,28 @@ theme_override_constants/margin_bottom = 4 [node name="TabContainer" type="TabContainer" parent="Layout"] layout_mode = 2 size_flags_vertical = 3 +current_tab = 0 [node name="Icons" parent="Layout/TabContainer" instance=ExtResource("2")] layout_mode = 2 +metadata/_tab_index = 0 [node name="Colors" parent="Layout/TabContainer" instance=ExtResource("3")] visible = false layout_mode = 2 +metadata/_tab_index = 1 [node name="Fonts" parent="Layout/TabContainer" instance=ExtResource("5")] visible = false layout_mode = 2 +metadata/_tab_index = 2 [node name="Styleboxes" parent="Layout/TabContainer" instance=ExtResource("6")] visible = false layout_mode = 2 +metadata/_tab_index = 3 [node name="Constants" parent="Layout/TabContainer" instance=ExtResource("4")] visible = false layout_mode = 2 +metadata/_tab_index = 4 diff --git a/addons/explore-editor-theme/lists/StyleboxListItem.tscn b/addons/explore-editor-theme/lists/StyleboxListItem.tscn index abaccd8..294a324 100644 --- a/addons/explore-editor-theme/lists/StyleboxListItem.tscn +++ b/addons/explore-editor-theme/lists/StyleboxListItem.tscn @@ -12,9 +12,7 @@ script = ExtResource("1") preview_background_texture = ExtResource("2_o5jg8") [node name="Layout" type="VBoxContainer" parent="."] -layout_mode = 0 -anchor_right = 1.0 -anchor_bottom = 1.0 +layout_mode = 2 theme_override_constants/separation = 0 [node name="PreviewContainer" type="MarginContainer" parent="Layout"] diff --git a/addons/explore-editor-theme/plugin.cfg b/addons/explore-editor-theme/plugin.cfg index ef91ef0..4010df1 100644 --- a/addons/explore-editor-theme/plugin.cfg +++ b/addons/explore-editor-theme/plugin.cfg @@ -3,5 +3,5 @@ name="Editor Theme Explorer" description="Explore Godot editor theme and browse through its icons, colors and fonts" author="Yuri Sizov " -version="2.1.0" +version="2.1.1" script="plugin.gd" diff --git a/addons/explore-editor-theme/tabs/EditorStyleboxes.gd b/addons/explore-editor-theme/tabs/EditorStyleboxes.gd index fb7716c..279e5a7 100644 --- a/addons/explore-editor-theme/tabs/EditorStyleboxes.gd +++ b/addons/explore-editor-theme/tabs/EditorStyleboxes.gd @@ -100,6 +100,8 @@ func _refresh_stylebox_list() -> void: if (horizontal_container.get_child_count() > 0): stylebox_list.add_child(horizontal_container) + else: + horizontal_container.queue_free() # Handlers func _on_filter_text_changed(value : String) -> void: diff --git a/addons/explore-editor-theme/ui/FilterTool.tscn b/addons/explore-editor-theme/ui/FilterTool.tscn index 6b042ba..cdc87ae 100644 --- a/addons/explore-editor-theme/ui/FilterTool.tscn +++ b/addons/explore-editor-theme/ui/FilterTool.tscn @@ -7,6 +7,7 @@ offset_right = 988.0 offset_bottom = 24.0 size_flags_horizontal = 3 script = ExtResource("1") +label_text = "Filter" [node name="Label" type="Label" parent="."] layout_mode = 2 diff --git a/editorconfig b/editorconfig new file mode 100644 index 0000000..83795a5 --- /dev/null +++ b/editorconfig @@ -0,0 +1,7 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_style = tab +insert_final_newline = true diff --git a/project.godot b/project.godot index 8fdf2ae..ae7c226 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="Plugin: Editor Theme Explorer" run/main_scene="res://addons/explore-editor-theme/ExplorerDialog.tscn" -config/features=PackedStringArray("4.2") +config/features=PackedStringArray("4.3") config/icon="res://addons/explore-editor-theme/plugin-icon.png" [editor_plugins]