mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 03:18:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #90318 from YeldhamDev/not_native_enough

Browse Source 
Fix built-in `FileDialog` appearing instead of the native one on some cases
This commit is contained in:
Rémi Verschelde 2024-04-08 11:21:46 +02:00
commit bca2c30b7d
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scene/gui/file_dialog.cpp
View File

@ -170,6 +170,20 @@ void FileDialog::_validate_property(PropertyInfo &p_property) const {
void FileDialog::_notification(int p_what) { void FileDialog::_notification(int p_what) {
switch (p_what) { switch (p_what) {
case NOTIFICATION_READY: {
#ifdef TOOLS_ENABLED
if (is_part_of_edited_scene()) {
return;
}
#endif
// Replace the built-in dialog with the native one if it started visible.
if (is_visible() && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_NATIVE_DIALOG_FILE) && (use_native_dialog || OS::get_singleton()->is_sandboxed())) {
ConfirmationDialog::set_visible(false);
_native_popup();
}
} break;
case NOTIFICATION_VISIBILITY_CHANGED: { case NOTIFICATION_VISIBILITY_CHANGED: {
if (!is_visible()) { if (!is_visible()) {
set_process_shortcut_input(false); set_process_shortcut_input(false);
@ -1392,6 +1406,18 @@ void FileDialog::set_default_show_hidden_files(bool p_show) {
void FileDialog::set_use_native_dialog(bool p_native) { void FileDialog::set_use_native_dialog(bool p_native) {
use_native_dialog = p_native; use_native_dialog = p_native;
#ifdef TOOLS_ENABLED
if (is_part_of_edited_scene()) {
return;
}
#endif
// Replace the built-in dialog with the native one if it's currently visible.
if (is_visible() && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_NATIVE_DIALOG_FILE) && (use_native_dialog || OS::get_singleton()->is_sandboxed())) {
ConfirmationDialog::set_visible(false);
_native_popup();
}
} }
bool FileDialog::get_use_native_dialog() const { bool FileDialog::get_use_native_dialog() const {