noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Use Array for node configuration warnings

Browse Source 
Previously, the warnings were passed as a string and delimitation of which were hard coded at each implementation.
This commit is contained in:
Nathan Franke
2020-10-29 05:01:28 -05:00
parent 4a1f2dcb74
commit 2a8c59c171
96 changed files with 426 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scene/gui/scroll_container.cpp
View File

@@ -544,8 +544,8 @@ void ScrollContainer::set_follow_focus(bool p_follow) {
follow_focus = p_follow;
}
String ScrollContainer::get_configuration_warning() const {
String warning = Container::get_configuration_warning();
TypedArray<String> ScrollContainer::get_configuration_warnings() const {
TypedArray<String> warnings = Container::get_configuration_warnings();
int found = 0;
@@ -565,12 +565,10 @@ String ScrollContainer::get_configuration_warning() const {
}
if (found != 1) {
if (!warning.is_empty()) {
warning += "\n\n";
}
warning += TTR("ScrollContainer is intended to work with a single child control.\nUse a container as child (VBox, HBox, etc.), or a Control and set the custom minimum size manually.");
warnings.push_back(TTR("ScrollContainer is intended to work with a single child control.\nUse a container as child (VBox, HBox, etc.), or a Control and set the custom minimum size manually."));
}
return warning;
return warnings;
}
HScrollBar *ScrollContainer::get_h_scrollbar() {