godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

Remove duplicate resizable settings

Browse Source 
(cherry picked from commit f1a7caf9bb)
This commit is contained in:
Fredia Huya-Kouadio
2022-04-04 09:18:07 -07:00
committed by Rémi Verschelde
parent 4ff726b933
commit a3b445d7e8
4 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/ProjectSettings.xml
View File

@@ -494,7 +494,7 @@
</member> </member>
<member name="display/window/size/resizable" type="bool" setter="" getter="" default="true"> <member name="display/window/size/resizable" type="bool" setter="" getter="" default="true">
Allows the window to be resizable by default. Allows the window to be resizable by default.
[b]Note:[/b] This setting is ignored on iOS and Android. [b]Note:[/b] This setting is ignored on iOS.
</member> </member>
<member name="display/window/size/test_height" type="int" setter="" getter="" default="0"> <member name="display/window/size/test_height" type="int" setter="" getter="" default="0">
If greater than zero, overrides the window height when running the game. Useful for testing stretch modes. If greater than zero, overrides the window height when running the game. Useful for testing stretch modes.

3
platform/android/export/export_plugin.cpp
View File

@@ -849,7 +849,7 @@ void EditorExportPlatformAndroid::_fix_manifest(const Ref<EditorExportPreset> &p
bool classify_as_game = p_preset->get("package/classify_as_game"); bool classify_as_game = p_preset->get("package/classify_as_game");
bool retain_data_on_uninstall = p_preset->get("package/retain_data_on_uninstall"); bool retain_data_on_uninstall = p_preset->get("package/retain_data_on_uninstall");
bool exclude_from_recents = p_preset->get("package/exclude_from_recents"); bool exclude_from_recents = p_preset->get("package/exclude_from_recents");
bool is_resizeable = p_preset->get("screen/is_resizeable"); bool is_resizeable = bool(GLOBAL_GET("display/window/size/resizable"));
Vector<String> perms; Vector<String> perms;
// Write permissions into the perms variable. // Write permissions into the perms variable.
@@ -1744,7 +1744,6 @@ void EditorExportPlatformAndroid::get_export_options(List<ExportOption> *r_optio
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_normal"), true)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_normal"), true));
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_large"), true)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_large"), true));
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_xlarge"), true)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_xlarge"), true));
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/is_resizeable"), false));
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "user_data_backup/allow"), false)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "user_data_backup/allow"), false));

2
platform/android/export/gradle_export_util.cpp
View File

@@ -259,7 +259,7 @@ String _get_activity_tag(const Ref<EditorExportPreset> &p_preset) {
"android:resizeableActivity=\"%s\">\n", "android:resizeableActivity=\"%s\">\n",
bool_to_string(p_preset->get("package/exclude_from_recents")), bool_to_string(p_preset->get("package/exclude_from_recents")),
orientation, orientation,
bool_to_string(p_preset->get("screen/is_resizeable"))); bool_to_string(bool(GLOBAL_GET("display/window/size/resizable"))));
if (uses_xr) { if (uses_xr) {
manifest_activity_text += " <meta-data tools:node=\"replace\" android:name=\"com.oculus.vr.focusaware\" android:value=\"true\" />\n"; manifest_activity_text += " <meta-data tools:node=\"replace\" android:name=\"com.oculus.vr.focusaware\" android:value=\"true\" />\n";
} else { } else {

3
platform/android/java_godot_io_wrapper.cpp
View File

@@ -208,14 +208,11 @@ void GodotIOJavaWrapper::hide_vk() {
} }
void GodotIOJavaWrapper::set_screen_orientation(int p_orient) { void GodotIOJavaWrapper::set_screen_orientation(int p_orient) {
// The Godot Android Editor sets its own orientation via its AndroidManifest
#ifndef TOOLS_ENABLED
if (_set_screen_orientation) { if (_set_screen_orientation) {
JNIEnv *env = get_jni_env(); JNIEnv *env = get_jni_env();
ERR_FAIL_COND(env == nullptr); ERR_FAIL_COND(env == nullptr);
env->CallVoidMethod(godot_io_instance, _set_screen_orientation, p_orient); env->CallVoidMethod(godot_io_instance, _set_screen_orientation, p_orient);
} }
#endif
} }
int GodotIOJavaWrapper::get_screen_orientation() const { int GodotIOJavaWrapper::get_screen_orientation() const {