diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-06-07 19:01:56 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-06-07 19:01:56 -0300 |
| commit | 193272aa8a809168b836dde3535cf96ce1f52264 (patch) | |
| tree | 4cf6e8a76c84cea57956a40da5f1a93b305808b4 /tools/editor | |
| parent | c2de978bac2d6209c09cd8ab21b0c666affc9733 (diff) | |
| parent | e6ac3a3f35252d44938d88b9471d1675731a56ec (diff) | |
Merge pull request #5098 from godotengine/revert-5082-EditorFontImportDialog-layout
Revert "Fix ui layout for EditorFontImportDialog"
Diffstat (limited to 'tools/editor')
| -rw-r--r-- | tools/editor/io_plugins/editor_font_import_plugin.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tools/editor/io_plugins/editor_font_import_plugin.cpp b/tools/editor/io_plugins/editor_font_import_plugin.cpp index 50cd61ed12..d5e6e3077e 100644 --- a/tools/editor/io_plugins/editor_font_import_plugin.cpp +++ b/tools/editor/io_plugins/editor_font_import_plugin.cpp @@ -622,7 +622,6 @@ public: VBoxContainer *vbr = memnew( VBoxContainer ); hbc->add_child(vbr); vbr->set_h_size_flags(SIZE_EXPAND_FILL); - vbr->set_custom_minimum_size(Size2(240,240)); source = memnew( EditorLineEditFileChooser ); source->get_file_dialog()->set_access(EditorFileDialog::ACCESS_FILESYSTEM); @@ -654,18 +653,18 @@ public: test_string = memnew( LineEdit ); test_string->set_text(TTR("The quick brown fox jumps over the lazy dog.")); test_string->set_h_size_flags(SIZE_EXPAND_FILL); + test_string->set_stretch_ratio(5); testhb->add_child(test_string); test_color = memnew( ColorPickerButton ); test_color->set_color(get_color("font_color","Label")); - test_color->set_text("Color"); - test_color->set_h_size_flags(SIZE_FILL); + test_color->set_h_size_flags(SIZE_EXPAND_FILL); + test_color->set_stretch_ratio(1); test_color->connect("color_changed",this,"_update_text3"); testhb->add_child(test_color); vbl->add_spacer(); - vbl->add_margin_child(TTR("Test:"),testhb); - testhb->set_h_size_flags(SIZE_EXPAND_FILL); + vbl->add_margin_child(TTR("Test:")+" ",testhb); /* HBoxContainer *upd_hb = memnew( HBoxContainer ); // vbl->add_child(upd_hb); |