asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #22822 from godotengine/revert-16977-master

Browse source 
Revert "Created a new function named get_element in GridContainer. This funct…"
This commit is contained in:
Rémi Verschelde 2018-10-07 11:19:55 +02:00 committed by GitHub
commit 13892f2668
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
scene/gui/grid_container.cpp
View file

@ -184,8 +184,6 @@ void GridContainer::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_columns", "columns"), &GridContainer::set_columns); ClassDB::bind_method(D_METHOD("set_columns", "columns"), &GridContainer::set_columns);
ClassDB::bind_method(D_METHOD("get_columns"), &GridContainer::get_columns); ClassDB::bind_method(D_METHOD("get_columns"), &GridContainer::get_columns);
ClassDB::bind_method(D_METHOD("get_child_control_at_cell", "row", "column"),
&GridContainer::get_child_control_at_cell);
ADD_PROPERTY(PropertyInfo(Variant::INT, "columns", PROPERTY_HINT_RANGE, "1,1024,1"), "set_columns", "get_columns"); ADD_PROPERTY(PropertyInfo(Variant::INT, "columns", PROPERTY_HINT_RANGE, "1,1024,1"), "set_columns", "get_columns");
} }
@ -241,21 +239,6 @@ Size2 GridContainer::get_minimum_size() const {
return ms; return ms;
} }
Control *GridContainer::get_child_control_at_cell(int row, int column) {
Control *c;
int grid_index = row * columns + column;
for (int i = 0; i < get_child_count(); i++) {
c = Object::cast_to<Control>(get_child(i));
if (!c || !c->is_visible_in_tree())
continue;
if (grid_index == i) {
break;
}
}
return c;
}
GridContainer::GridContainer() { GridContainer::GridContainer() {
set_mouse_filter(MOUSE_FILTER_PASS); set_mouse_filter(MOUSE_FILTER_PASS);

1
scene/gui/grid_container.h
View file

@ -47,7 +47,6 @@ public:
void set_columns(int p_columns); void set_columns(int p_columns);
int get_columns() const; int get_columns() const;
virtual Size2 get_minimum_size() const; virtual Size2 get_minimum_size() const;
Control *get_child_control_at_cell(int row, int column);
GridContainer(); GridContainer();
}; };