aboutsummaryrefslogtreecommitdiff
path: root/tools/editor/plugins/theme_editor_plugin.cpp
diff options
context:
space:
mode:
authorMarianoGNU2015-10-19 17:46:13 -0300
committerMarianoGNU2015-10-19 17:46:13 -0300
commit6df7d923797908ecf38684c0008c0e4b6475d884 (patch)
treec5751c64cf09a701f26db1dc86a7e2f64d06f44a /tools/editor/plugins/theme_editor_plugin.cpp
parentede0cf20bb1a41b316a39c320ad86c76d41ba9c2 (diff)
downloadgodot-6df7d923797908ecf38684c0008c0e4b6475d884.tar.gz
godot-6df7d923797908ecf38684c0008c0e4b6475d884.tar.zst
godot-6df7d923797908ecf38684c0008c0e4b6475d884.zip
Fix ButtonGroup broken layout
Diffstat (limited to 'tools/editor/plugins/theme_editor_plugin.cpp')
-rw-r--r--tools/editor/plugins/theme_editor_plugin.cpp36
1 files changed, 17 insertions, 19 deletions
diff --git a/tools/editor/plugins/theme_editor_plugin.cpp b/tools/editor/plugins/theme_editor_plugin.cpp
index 55e8f164d..63ba57bfc 100644
--- a/tools/editor/plugins/theme_editor_plugin.cpp
+++ b/tools/editor/plugins/theme_editor_plugin.cpp
@@ -568,26 +568,24 @@ ThemeEditor::ThemeEditor() {
CheckButton *cb = memnew( CheckButton );
cb->set_text("CheckButton");
first_vb->add_child(cb );
- CheckBox *cbx = memnew( CheckBox );
- cbx->set_text("CheckBox");
- first_vb->add_child(cbx );
+ CheckBox *cbx = memnew( CheckBox );
+ cbx->set_text("CheckBox");
+ first_vb->add_child(cbx );
- /* TODO: This is not working properly, controls are overlapping*/
- /*
- ButtonGroup *bg = memnew( ButtonGroup );
- bg->set_v_size_flags(SIZE_EXPAND_FILL);
- VBoxContainer *gbvb = memnew( VBoxContainer );
- gbvb->set_v_size_flags(SIZE_EXPAND_FILL);
- CheckBox *rbx1 = memnew( CheckBox );
- rbx1->set_text("CheckBox Radio1");
- rbx1->set_pressed(true);
- gbvb->add_child(rbx1);
- CheckBox *rbx2 = memnew( CheckBox );
- rbx2->set_text("CheckBox Radio2");
- gbvb->add_child(rbx2);
- bg->add_child(gbvb);
- first_vb->add_child(bg);
- */
+
+ ButtonGroup *bg = memnew( ButtonGroup );
+ bg->set_v_size_flags(SIZE_EXPAND_FILL);
+ VBoxContainer *gbvb = memnew( VBoxContainer );
+ gbvb->set_v_size_flags(SIZE_EXPAND_FILL);
+ CheckBox *rbx1 = memnew( CheckBox );
+ rbx1->set_text("CheckBox Radio1");
+ rbx1->set_pressed(true);
+ gbvb->add_child(rbx1);
+ CheckBox *rbx2 = memnew( CheckBox );
+ rbx2->set_text("CheckBox Radio2");
+ gbvb->add_child(rbx2);
+ bg->add_child(gbvb);
+ first_vb->add_child(bg);
MenuButton* test_menu_button = memnew( MenuButton );
test_menu_button->set_text("MenuButton");