From 3e8f0b4b7509e136dccbf315cab8ccce9396adb6 Mon Sep 17 00:00:00 2001 From: Alex Drozd Date: Thu, 18 May 2023 19:22:23 +0200 Subject: Exclude overriden properties from Property Descriptions section (cherry picked from commit 28f391f301e55755d3c2bd0055d783da4ef5e122) --- editor/editor_help.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp index acbc3ce0dc..bbcf3573ff 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -841,14 +841,15 @@ void EditorHelp::_update_doc() { // Properties overview HashSet skip_methods; - bool has_properties = cd.properties.size() != 0; - if (cd.is_script_doc) { - has_properties = false; - for (int i = 0; i < cd.properties.size(); i++) { - if (cd.properties[i].name.begins_with("_") && cd.properties[i].description.strip_edges().is_empty()) { - continue; - } - has_properties = true; + bool has_properties = false; + bool has_property_descriptions = false; + for (const DocData::PropertyDoc &prop : cd.properties) { + if (cd.is_script_doc && prop.name.begins_with("_") && prop.description.strip_edges().is_empty()) { + continue; + } + has_properties = true; + if (!prop.overridden) { + has_property_descriptions = true; break; } } @@ -1527,7 +1528,7 @@ void EditorHelp::_update_doc() { } // Property descriptions - if (has_properties) { + if (has_property_descriptions) { section_line.push_back(Pair(TTR("Property Descriptions"), class_desc->get_paragraph_count() - 2)); _push_title_font(); class_desc->add_text(TTR("Property Descriptions")); -- cgit v1.2.3