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

Merge pull request #82552 from bruvzg/fd_visible 

[FileDialog] Make set_visible compatible with native dialogs.
This commit is contained in:
Rémi Verschelde 2023-09-30 11:03:55 +02:00
parent 2566cbec5c c52db6190c
commit b97af40ac1
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scene/gui/file_dialog.cpp
View File

@ -63,6 +63,16 @@ void FileDialog::popup(const Rect2i &p_rect) {
}
}
void FileDialog::set_visible(bool p_visible) {
if (access == ACCESS_FILESYSTEM && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_NATIVE_DIALOG) && (use_native_dialog || OS::get_singleton()->is_sandboxed())) {
if (p_visible) {
DisplayServer::get_singleton()->file_dialog_show(get_title(), dir->get_text(), file->get_text().get_file(), show_hidden_files, DisplayServer::FileDialogMode(mode), filters, callable_mp(this, &FileDialog::_native_dialog_cb));
}
} else {
ConfirmationDialog::set_visible(p_visible);
}
}
void FileDialog::_native_dialog_cb(bool p_ok, const Vector<String> &p_files) {
if (p_ok) {
if (p_files.size() > 0) {

1
scene/gui/file_dialog.h
View File

@ -171,6 +171,7 @@ protected:
static void _bind_methods();
public:
virtual void set_visible(bool p_visible) override;
virtual void popup(const Rect2i &p_rect = Rect2i()) override;
void popup_file_dialog();

2
scene/main/window.h
View File

@ -293,7 +293,7 @@ public:
void request_attention();
void move_to_foreground();
void set_visible(bool p_visible);
virtual void set_visible(bool p_visible);
bool is_visible() const;
void update_mouse_cursor_state() override;