diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-27 12:12:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-27 12:12:34 +0100 |
| commit | 4b36b6e92abea51baf8420e6c7dccd89a440bc59 (patch) | |
| tree | 20b344c9ac640b4239ad44041c89c3f614e2b4a1 /platform/android | |
| parent | 203e261526ebe123523d7e6ea6cfc6c628216e9d (diff) | |
| parent | 89f37d410557c9062b45f090f08d006453bc4fc9 (diff) | |
Merge pull request #56785 from bruvzg/nat_handles_4
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/display_server_android.cpp | 18 | ||||
| -rw-r--r-- | platform/android/display_server_android.h | 3 |
2 files changed, 21 insertions, 0 deletions
diff --git a/platform/android/display_server_android.cpp b/platform/android/display_server_android.cpp index 15f61db27c..3d0dabc56e 100644 --- a/platform/android/display_server_android.cpp +++ b/platform/android/display_server_android.cpp @@ -253,6 +253,24 @@ DisplayServer::WindowID DisplayServerAndroid::get_window_at_screen_position(cons return MAIN_WINDOW_ID; } +int64_t DisplayServerAndroid::window_get_native_handle(HandleType p_handle_type, WindowID p_window) const { + ERR_FAIL_COND_V(p_window != MAIN_WINDOW_ID, 0); + switch (p_handle_type) { + case DISPLAY_HANDLE: { + return 0; // Not supported. + } + case WINDOW_HANDLE: { + return (int64_t)((OS_Android *)OS::get_singleton())->get_godot_java()->get_activity(); + } + case WINDOW_VIEW: { + return 0; // Not supported. + } + default: { + return 0; + } + } +} + void DisplayServerAndroid::window_attach_instance_id(ObjectID p_instance, DisplayServer::WindowID p_window) { window_attached_instance_id = p_instance; } diff --git a/platform/android/display_server_android.h b/platform/android/display_server_android.h index 6aadc7e1a9..e52e07bf1a 100644 --- a/platform/android/display_server_android.h +++ b/platform/android/display_server_android.h @@ -124,6 +124,9 @@ public: virtual Vector<WindowID> get_window_list() const override; virtual WindowID get_window_at_screen_position(const Point2i &p_position) const override; + + virtual int64_t window_get_native_handle(HandleType p_handle_type, WindowID p_window = MAIN_WINDOW_ID) const override; + virtual void window_attach_instance_id(ObjectID p_instance, WindowID p_window = MAIN_WINDOW_ID) override; virtual ObjectID window_get_attached_instance_id(WindowID p_window = MAIN_WINDOW_ID) const override; virtual void window_set_title(const String &p_title, WindowID p_window = MAIN_WINDOW_ID) override; |