diff options
Diffstat (limited to 'scene/gui/grid_container.h')
| -rw-r--r-- | scene/gui/grid_container.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scene/gui/grid_container.h b/scene/gui/grid_container.h index 0ed8863196..9b43a5bc7e 100644 --- a/scene/gui/grid_container.h +++ b/scene/gui/grid_container.h @@ -5,8 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ +/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -34,10 +34,9 @@ #include "scene/gui/container.h" class GridContainer : public Container { - GDCLASS(GridContainer, Container); - int columns; + int columns = 1; protected: void _notification(int p_what); @@ -46,7 +45,7 @@ protected: public: void set_columns(int p_columns); int get_columns() const; - virtual Size2 get_minimum_size() const; + virtual Size2 get_minimum_size() const override; GridContainer(); }; |