diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-06-07 23:44:01 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-06-07 23:44:01 +0200 |
| commit | c2de978bac2d6209c09cd8ab21b0c666affc9733 (patch) | |
| tree | 36485fab985110780ea8e1d1e3ed4db0943a9e74 | |
| parent | 5e01566d01023b0ce136e6db122d5817d9b207eb (diff) | |
| parent | a1ba404cc5d31e8b71edcc95737afe318fc01108 (diff) | |
Merge pull request #5082 from Geequlim/EditorFontImportDialog-layout
Fix ui layout for EditorFontImportDialog
| -rw-r--r-- | tools/editor/io_plugins/editor_font_import_plugin.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/editor/io_plugins/editor_font_import_plugin.cpp b/tools/editor/io_plugins/editor_font_import_plugin.cpp index d5e6e3077e..50cd61ed12 100644 --- a/tools/editor/io_plugins/editor_font_import_plugin.cpp +++ b/tools/editor/io_plugins/editor_font_import_plugin.cpp @@ -622,6 +622,7 @@ 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); @@ -653,18 +654,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_h_size_flags(SIZE_EXPAND_FILL); - test_color->set_stretch_ratio(1); + test_color->set_text("Color"); + test_color->set_h_size_flags(SIZE_FILL); test_color->connect("color_changed",this,"_update_text3"); testhb->add_child(test_color); vbl->add_spacer(); - vbl->add_margin_child(TTR("Test:")+" ",testhb); + vbl->add_margin_child(TTR("Test:"),testhb); + testhb->set_h_size_flags(SIZE_EXPAND_FILL); /* HBoxContainer *upd_hb = memnew( HBoxContainer ); // vbl->add_child(upd_hb); |