Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 15:21:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit godotengine/godot@e1b4101e34

Browse Source
This commit is contained in:
Spartan322
2025-07-01 06:19:10 -04:00
parent d1fd9a36b6 e1b4101e34
commit 0a87a7b475
627 changed files with 158460 additions and 3719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/android/display_server_android.cpp
View File

@@ -65,6 +65,11 @@ bool DisplayServerAndroid::has_feature(Feature p_feature) const {
return (native_menu && native_menu->has_feature(NativeMenu::FEATURE_GLOBAL_MENU));
} break;
#endif
case FEATURE_NATIVE_DIALOG_FILE: {
String sdk_version = OS::get_singleton()->get_version().get_slicec('.', 0);
return sdk_version.to_int() >= 29;
} break;
case FEATURE_CURSOR_SHAPE:
//case FEATURE_CUSTOM_CURSOR_SHAPE:
//case FEATURE_HIDPI:
@@ -74,7 +79,6 @@ bool DisplayServerAndroid::has_feature(Feature p_feature) const {
//case FEATURE_MOUSE_WARP:
case FEATURE_NATIVE_DIALOG:
case FEATURE_NATIVE_DIALOG_INPUT:
case FEATURE_NATIVE_DIALOG_FILE:
//case FEATURE_NATIVE_DIALOG_FILE_EXTRA:
case FEATURE_NATIVE_DIALOG_FILE_MIME:
//case FEATURE_NATIVE_ICON: