diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2023-01-06 22:57:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-06 22:57:13 +0100 |
| commit | 670405905d40280294e5b8100c10294f54e9b6c9 (patch) | |
| tree | f6152f9b3b1bba8cfd52f38423eb0d32785117f1 /editor | |
| parent | bd15c3f80e8f7d159dce743bdc389fc2815aec51 (diff) | |
| parent | 0ba5d41a44e134577dcb11444f89a30424ac2af9 (diff) | |
Merge pull request #70999 from timothyqiu/unique-res-confirm
Fix unreadable text in Make Sub-Resources Unique window
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/inspector_dock.cpp | 8 | ||||
| -rw-r--r-- | editor/inspector_dock.h | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/editor/inspector_dock.cpp b/editor/inspector_dock.cpp index 4bd1d7e83e..fbe01c26b0 100644 --- a/editor/inspector_dock.cpp +++ b/editor/inspector_dock.cpp @@ -142,10 +142,11 @@ void InspectorDock::_menu_option_confirm(int p_option, bool p_confirmed) { ti->set_text(0, bool(EDITOR_GET("interface/inspector/capitalize_properties")) ? propname.capitalize() : propname); } + unique_resources_label->set_text(TTR("The following resources will be duplicated and embedded within this resource/object.")); unique_resources_confirmation->popup_centered(); } else { - unique_resources_confirmation->set_text(TTR("This object has no resources.")); current_option = -1; + unique_resources_label->set_text(TTR("This object has no resources.")); unique_resources_confirmation->popup_centered(); } } else { @@ -734,9 +735,8 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) { VBoxContainer *container = memnew(VBoxContainer); unique_resources_confirmation->add_child(container); - Label *top_label = memnew(Label); - top_label->set_text(TTR("The following resources will be duplicated and embedded within this resource/object.")); - container->add_child(top_label); + unique_resources_label = memnew(Label); + container->add_child(unique_resources_label); unique_resources_list_tree = memnew(Tree); unique_resources_list_tree->set_hide_root(true); diff --git a/editor/inspector_dock.h b/editor/inspector_dock.h index 0e7905c8e4..fb2e1d53b1 100644 --- a/editor/inspector_dock.h +++ b/editor/inspector_dock.h @@ -99,6 +99,7 @@ class InspectorDock : public VBoxContainer { int current_option = -1; ConfirmationDialog *unique_resources_confirmation = nullptr; + Label *unique_resources_label = nullptr; Tree *unique_resources_list_tree = nullptr; EditorPropertyNameProcessor::Style property_name_style; |