diff options
author | Juan Linietsky <reduzio@gmail.com> | 2015-11-18 19:14:25 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2015-11-18 19:14:25 -0300 |
commit | a8f18e1bae63edcca6342b8e507585be6ba56d20 (patch) | |
tree | 206872dd8af2ad17782641202d555126548589f1 /scene/gui | |
parent | cba634c608a61d82e96073b7d6c42df24fb9f5b3 (diff) | |
parent | 6df7d923797908ecf38684c0008c0e4b6475d884 (diff) |
Merge pull request #2639 from MarianoGnu/origin
Fix ButtonGroup broken layout
Diffstat (limited to 'scene/gui')
-rw-r--r-- | scene/gui/button_group.cpp | 2 | ||||
-rw-r--r-- | scene/gui/button_group.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scene/gui/button_group.cpp b/scene/gui/button_group.cpp index 8d1fa80b84..c92d7f2696 100644 --- a/scene/gui/button_group.cpp +++ b/scene/gui/button_group.cpp @@ -155,6 +155,6 @@ void ButtonGroup::_bind_methods() { } -ButtonGroup::ButtonGroup() +ButtonGroup::ButtonGroup() : BoxContainer(true) { } diff --git a/scene/gui/button_group.h b/scene/gui/button_group.h index 24edf94994..74e847e937 100644 --- a/scene/gui/button_group.h +++ b/scene/gui/button_group.h @@ -29,14 +29,14 @@ #ifndef BUTTON_GROUP_H #define BUTTON_GROUP_H -#include "scene/gui/control.h" +#include "scene/gui/box_container.h" class BaseButton; -class ButtonGroup : public Control { +class ButtonGroup : public BoxContainer { - OBJ_TYPE(ButtonGroup,Control); + OBJ_TYPE(ButtonGroup,BoxContainer); Set<BaseButton*> buttons; |