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/osx | |
| parent | 203e261526ebe123523d7e6ea6cfc6c628216e9d (diff) | |
| parent | 89f37d410557c9062b45f090f08d006453bc4fc9 (diff) | |
Merge pull request #56785 from bruvzg/nat_handles_4
Diffstat (limited to 'platform/osx')
| -rw-r--r-- | platform/osx/display_server_osx.h | 2 | ||||
| -rw-r--r-- | platform/osx/display_server_osx.mm | 18 |
2 files changed, 20 insertions, 0 deletions
diff --git a/platform/osx/display_server_osx.h b/platform/osx/display_server_osx.h index d609a84e50..2b4bcc3e02 100644 --- a/platform/osx/display_server_osx.h +++ b/platform/osx/display_server_osx.h @@ -282,6 +282,8 @@ public: 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 gl_window_make_current(DisplayServer::WindowID p_window_id) override; diff --git a/platform/osx/display_server_osx.mm b/platform/osx/display_server_osx.mm index 1340aad9b2..744143574b 100644 --- a/platform/osx/display_server_osx.mm +++ b/platform/osx/display_server_osx.mm @@ -3526,6 +3526,24 @@ DisplayServer::WindowID DisplayServerOSX::get_window_at_screen_position(const Po return INVALID_WINDOW_ID; } +int64_t DisplayServerOSX::window_get_native_handle(HandleType p_handle_type, WindowID p_window) const { + ERR_FAIL_COND_V(!windows.has(p_window), 0); + switch (p_handle_type) { + case DISPLAY_HANDLE: { + return 0; // Not supported. + } + case WINDOW_HANDLE: { + return (int64_t)windows[p_window].window_object; + } + case WINDOW_VIEW: { + return (int64_t)windows[p_window].window_view; + } + default: { + return 0; + } + } +} + void DisplayServerOSX::window_attach_instance_id(ObjectID p_instance, WindowID p_window) { _THREAD_SAFE_METHOD_ |