Bladeren bron

Merge pull request #5098 from godotengine/revert-5082-EditorFontImportDialog-layout

Revert "Fix ui layout for EditorFontImportDialog"
Juan Linietsky 9 jaren geleden
bovenliggende
commit
193272aa8a
1 gewijzigde bestanden met toevoegingen van 4 en 5 verwijderingen
  1. 4 5
      tools/editor/io_plugins/editor_font_import_plugin.cpp

+ 4 - 5
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);