summaryrefslogtreecommitdiffstats
path: root/scene/gui
diff options
context:
space:
mode:
Diffstat (limited to 'scene/gui')
-rw-r--r--scene/gui/file_dialog.cpp10
-rw-r--r--scene/gui/file_dialog.h1
-rw-r--r--scene/gui/spin_box.cpp3
3 files changed, 14 insertions, 0 deletions
diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp
index 7af7b2cf7e..3857281a66 100644
--- a/scene/gui/file_dialog.cpp
+++ b/scene/gui/file_dialog.cpp
@@ -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) {
diff --git a/scene/gui/file_dialog.h b/scene/gui/file_dialog.h
index 739cb3e31a..1a87b79fdd 100644
--- a/scene/gui/file_dialog.h
+++ b/scene/gui/file_dialog.h
@@ -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();
diff --git a/scene/gui/spin_box.cpp b/scene/gui/spin_box.cpp
index e13fd21949..26dbe1cb0c 100644
--- a/scene/gui/spin_box.cpp
+++ b/scene/gui/spin_box.cpp
@@ -263,6 +263,9 @@ void SpinBox::_notification(int p_what) {
_update_text();
} break;
+ case NOTIFICATION_VISIBILITY_CHANGED:
+ drag.allowed = false;
+ [[fallthrough]];
case NOTIFICATION_EXIT_TREE: {
_release_mouse();
} break;