diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2017-08-11 10:35:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-11 10:35:10 +0200 |
commit | 5cb09d31d8c81584df51774f16caeefd2f98564e (patch) | |
tree | ac00505ba664e09cf4348971cfc7a174665c20e3 /platform/osx/os_osx.h | |
parent | afecc6ae0b7ea67736cbeef53d30824343af78b5 (diff) | |
parent | 8aa86cb9bcb5db8a1909d4b1595e90dbffbff11e (diff) |
Merge pull request #10142 from bruvzg/3.0-osx-ime
Add IME support (macOS)
Diffstat (limited to 'platform/osx/os_osx.h')
-rw-r--r-- | platform/osx/os_osx.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h index 4b5682518f..56e6802eeb 100644 --- a/platform/osx/os_osx.h +++ b/platform/osx/os_osx.h @@ -104,6 +104,10 @@ public: Size2 window_size; Rect2 restore_rect; + Point2 im_position; + ImeCallback im_callback; + void *im_target; + power_osx *power_manager; float _mouse_scale(float p_scale) { @@ -203,6 +207,8 @@ public: virtual void set_borderless_window(int p_borderless); virtual bool get_borderless_window(); + virtual void set_ime_position(const Point2 &p_pos); + virtual void set_ime_intermediate_text_callback(ImeCallback p_callback, void *p_inp); virtual PowerState get_power_state(); virtual int get_power_seconds_left(); |