diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2022-01-20 12:09:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-20 12:09:45 +0100 |
commit | b6cb3668847379149b879d0633e8196900a845b7 (patch) | |
tree | cd73656d30a276904bc87a4a3c59e8c9643847ad /platform/android/display_server_android.cpp | |
parent | 7057d26343a8d8b7e743be48cd9207272ce6a8c6 (diff) | |
parent | 314f309035c9d50b41720e02550f31f89751fce0 (diff) |
Merge pull request #56949 from timothyqiu/has-clipboard
Diffstat (limited to 'platform/android/display_server_android.cpp')
-rw-r--r-- | platform/android/display_server_android.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/platform/android/display_server_android.cpp b/platform/android/display_server_android.cpp index 941cf9fd53..15f61db27c 100644 --- a/platform/android/display_server_android.cpp +++ b/platform/android/display_server_android.cpp @@ -95,6 +95,17 @@ String DisplayServerAndroid::clipboard_get() const { } } +bool DisplayServerAndroid::clipboard_has() const { + GodotJavaWrapper *godot_java = OS_Android::get_singleton()->get_godot_java(); + ERR_FAIL_COND_V(!godot_java, false); + + if (godot_java->has_has_clipboard()) { + return godot_java->has_clipboard(); + } else { + return DisplayServer::clipboard_has(); + } +} + void DisplayServerAndroid::screen_set_keep_on(bool p_enable) { GodotJavaWrapper *godot_java = OS_Android::get_singleton()->get_godot_java(); ERR_FAIL_COND(!godot_java); |