Browse Source

Merge pull request #64733 from Mickeon/try-editor-warning-spacing

Rémi Verschelde 3 years ago
parent
commit
1190fbdf2b
1 changed files with 13 additions and 1 deletions
  1. 13 1
      editor/scene_tree_editor.cpp

+ 13 - 1
editor/scene_tree_editor.cpp

@@ -279,7 +279,19 @@ void SceneTreeEditor::_add_nodes(Node *p_node, TreeItem *p_parent) {
 				warning_icon = SNAME("NodeWarnings4Plus");
 				warning_icon = SNAME("NodeWarnings4Plus");
 			}
 			}
 
 
-			item->add_button(0, get_theme_icon(warning_icon, SNAME("EditorIcons")), BUTTON_WARNING, false, TTR("Node configuration warning:") + "\n" + warning);
+			// Improve looks on tooltip, extra spacing on non-bullet point newlines.
+			const String bullet_point = String::utf8("•  ");
+			int next_newline = 0;
+			while (next_newline != -1) {
+				next_newline = warning.find("\n", next_newline + 2);
+				if (warning.substr(next_newline + 1, bullet_point.length()) != bullet_point) {
+					warning = warning.insert(next_newline + 1, "    ");
+				}
+			}
+
+			String newline = (num_warnings == 1 ? "\n" : "\n\n");
+
+			item->add_button(0, get_theme_icon(warning_icon, SNAME("EditorIcons")), BUTTON_WARNING, false, TTR("Node configuration warning:") + newline + warning);
 		}
 		}
 
 
 		if (p_node->is_unique_name_in_owner()) {
 		if (p_node->is_unique_name_in_owner()) {