godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #90229 from Santoss1809/master 

Fix error message when removing only child from GraphNode
This commit is contained in:
Rémi Verschelde 2024-04-26 11:08:25 +02:00
parent 643afab6b7 eb9e193477
commit a37db390e0
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scene/gui/graph_node.cpp
View File

@ -336,7 +336,8 @@ void GraphNode::_notification(int p_what) {
int width = get_size().width - sb_panel->get_minimum_size().x; int width = get_size().width - sb_panel->get_minimum_size().x;
if (get_child_count() > 0) { // Take the HboxContainer child into account.
if (get_child_count(false) > 0) {
int slot_index = 0; int slot_index = 0;
for (const KeyValue<int, Slot> &E : slot_table) { for (const KeyValue<int, Slot> &E : slot_table) {
if (E.key < 0 || E.key >= slot_y_cache.size()) { if (E.key < 0 || E.key >= slot_y_cache.size()) {

59
tests/scene/test_graph_node.h Normal file
View File

@ -0,0 +1,59 @@
/**************************************************************************/
/* test_graph_node.h */
/**************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/**************************************************************************/
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef TEST_GRAPH_NODE_H
#define TEST_GRAPH_NODE_H
#include "scene/gui/graph_node.h"
#include "scene/main/window.h"
#include "tests/test_macros.h"
namespace TestGraphNode {
TEST_CASE("[GraphNode][SceneTree]") {
SUBCASE("[GraphNode] Graph Node only child on delete should not cause error.") {
// Setup.
GraphNode *test_node = memnew(GraphNode);
test_child->set_name("Graph Node");
Control *test_child = memnew(Control);
test_child->set_name("child");
test_node->add_child(test_child);
// Test.
CHECK_NOTHROW_MESSAGE(test_node->remove_child(test_child));
memdelete(test_node);
}
}
} // namespace TestGraphNode
#endif // TEST_GRAPH_NODE_H