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

Merge pull request #89902 from timothyqiu/not-available 

Return `ERR_UNAVAILABLE` if native dialog is not supported
This commit is contained in:
Rémi Verschelde 2024-03-26 13:45:53 +01:00
parent 3fa6ec7285 7118fb9cda
commit 7d151c8381
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servers/display_server.cpp
View File

@ -645,22 +645,22 @@ void DisplayServer::enable_for_stealing_focus(OS::ProcessID pid) {
Error DisplayServer::dialog_show(String p_title, String p_description, Vector<String> p_buttons, const Callable &p_callback) { Error DisplayServer::dialog_show(String p_title, String p_description, Vector<String> p_buttons, const Callable &p_callback) {
WARN_PRINT("Native dialogs not supported by this display server."); WARN_PRINT("Native dialogs not supported by this display server.");
return OK; return ERR_UNAVAILABLE;
} }
Error DisplayServer::dialog_input_text(String p_title, String p_description, String p_partial, const Callable &p_callback) { Error DisplayServer::dialog_input_text(String p_title, String p_description, String p_partial, const Callable &p_callback) {
WARN_PRINT("Native dialogs not supported by this display server."); WARN_PRINT("Native dialogs not supported by this display server.");
return OK; return ERR_UNAVAILABLE;
} }
Error DisplayServer::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback) { Error DisplayServer::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback) {
WARN_PRINT("Native dialogs not supported by this display server."); WARN_PRINT("Native dialogs not supported by this display server.");
return OK; return ERR_UNAVAILABLE;
} }
Error DisplayServer::file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback) { Error DisplayServer::file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback) {
WARN_PRINT("Native dialogs not supported by this display server."); WARN_PRINT("Native dialogs not supported by this display server.");
return OK; return ERR_UNAVAILABLE;
} }
int DisplayServer::keyboard_get_layout_count() const { int DisplayServer::keyboard_get_layout_count() const {