godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91291 from m4gr3d/fix_unreachable_export_button_android_editor 

Fix export dialog sizing issue on small devices
This commit is contained in:
Rémi Verschelde 2024-05-20 17:06:34 +02:00
parent 7b89bd4496 60a4cc2fbe
commit b5f8f103aa
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
editor/export/project_export.cpp
View File

@ -131,7 +131,7 @@ void ProjectExportDialog::popup_export() {
if (saved_size != Rect2()) { if (saved_size != Rect2()) {
popup(saved_size); popup(saved_size);
} else { } else {
popup_centered_clamped(Size2(900, 700) * EDSCALE, 0.8); popup_centered_clamped(Size2(900, 500) * EDSCALE, 0.7);
} }
} }
@ -1311,9 +1311,15 @@ ProjectExportDialog::ProjectExportDialog() {
// Resources export parameters. // Resources export parameters.
ScrollContainer *resources_scroll_container = memnew(ScrollContainer);
resources_scroll_container->set_name(TTR("Resources"));
resources_scroll_container->set_horizontal_scroll_mode(ScrollContainer::SCROLL_MODE_DISABLED);
sections->add_child(resources_scroll_container);
VBoxContainer *resources_vb = memnew(VBoxContainer); VBoxContainer *resources_vb = memnew(VBoxContainer);
sections->add_child(resources_vb); resources_vb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
resources_vb->set_name(TTR("Resources")); resources_vb->set_v_size_flags(Control::SIZE_EXPAND_FILL);
resources_scroll_container->add_child(resources_vb);
export_filter = memnew(OptionButton); export_filter = memnew(OptionButton);
export_filter->add_item(TTR("Export all resources in the project")); export_filter->add_item(TTR("Export all resources in the project"));
@ -1332,6 +1338,7 @@ ProjectExportDialog::ProjectExportDialog() {
resources_vb->add_child(include_margin); resources_vb->add_child(include_margin);
include_files = memnew(Tree); include_files = memnew(Tree);
include_files->set_custom_minimum_size(Size2(1, 75 * EDSCALE));
include_margin->add_child(include_files); include_margin->add_child(include_files);
include_files->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); include_files->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
include_files->connect("item_edited", callable_mp(this, &ProjectExportDialog::_tree_changed)); include_files->connect("item_edited", callable_mp(this, &ProjectExportDialog::_tree_changed));
@ -1384,18 +1391,25 @@ ProjectExportDialog::ProjectExportDialog() {
VBoxContainer *feature_vb = memnew(VBoxContainer); VBoxContainer *feature_vb = memnew(VBoxContainer);
feature_vb->set_name(TTR("Features")); feature_vb->set_name(TTR("Features"));
feature_vb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
custom_features = memnew(LineEdit); custom_features = memnew(LineEdit);
custom_features->connect("text_changed", callable_mp(this, &ProjectExportDialog::_custom_features_changed)); custom_features->connect("text_changed", callable_mp(this, &ProjectExportDialog::_custom_features_changed));
feature_vb->add_margin_child(TTR("Custom (comma-separated):"), custom_features); feature_vb->add_margin_child(TTR("Custom (comma-separated):"), custom_features);
custom_feature_display = memnew(RichTextLabel); custom_feature_display = memnew(RichTextLabel);
custom_feature_display->set_custom_minimum_size(Size2(1, 75 * EDSCALE));
custom_feature_display->set_v_size_flags(Control::SIZE_EXPAND_FILL); custom_feature_display->set_v_size_flags(Control::SIZE_EXPAND_FILL);
feature_vb->add_margin_child(TTR("Feature List:"), custom_feature_display, true); feature_vb->add_margin_child(TTR("Feature List:"), custom_feature_display, true);
sections->add_child(feature_vb); sections->add_child(feature_vb);
// Encryption export parameters. // Encryption export parameters.
ScrollContainer *sec_scroll_container = memnew(ScrollContainer);
sec_scroll_container->set_name(TTR("Encryption"));
sec_scroll_container->set_horizontal_scroll_mode(ScrollContainer::SCROLL_MODE_DISABLED);
VBoxContainer *sec_vb = memnew(VBoxContainer); VBoxContainer *sec_vb = memnew(VBoxContainer);
sec_vb->set_name(TTR("Encryption")); sec_vb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
sec_scroll_container->add_child(sec_vb);
enc_pck = memnew(CheckButton); enc_pck = memnew(CheckButton);
enc_pck->connect("toggled", callable_mp(this, &ProjectExportDialog::_enc_pck_changed)); enc_pck->connect("toggled", callable_mp(this, &ProjectExportDialog::_enc_pck_changed));
@ -1426,7 +1440,7 @@ ProjectExportDialog::ProjectExportDialog() {
script_key_error->add_theme_color_override("font_color", EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("error_color"), EditorStringName(Editor))); script_key_error->add_theme_color_override("font_color", EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("error_color"), EditorStringName(Editor)));
sec_vb->add_margin_child(TTR("Encryption Key (256-bits as hexadecimal):"), script_key); sec_vb->add_margin_child(TTR("Encryption Key (256-bits as hexadecimal):"), script_key);
sec_vb->add_child(script_key_error); sec_vb->add_child(script_key_error);
sections->add_child(sec_vb); sections->add_child(sec_scroll_container);
Label *sec_info = memnew(Label); Label *sec_info = memnew(Label);
sec_info->set_text(TTR("Note: Encryption key needs to be stored in the binary,\nyou need to build the export templates from source.")); sec_info->set_text(TTR("Note: Encryption key needs to be stored in the binary,\nyou need to build the export templates from source."));