diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-03 16:04:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-03 16:04:38 +0200 |
| commit | f50dd682f6a0f9506daaf16fed06f4bc9efa6599 (patch) | |
| tree | 24e357eb4ca9a3f384bdee590ed61f1c5e13fec8 | |
| parent | 1ebfd918d4b56a53ff1223cdf1912aa89863bb8b (diff) | |
| parent | e5470cfa70121221fd9e51b085ec0dff259b5865 (diff) | |
Merge pull request #21727 from guilhermefelipecgs/fix_cursor_hotspot
Fix custom cursor hotspot
| -rw-r--r-- | doc/classes/Input.xml | 2 | ||||
| -rw-r--r-- | platform/osx/os_osx.mm | 1 | ||||
| -rw-r--r-- | platform/windows/os_windows.cpp | 1 | ||||
| -rw-r--r-- | platform/x11/os_x11.cpp | 1 |
4 files changed, 5 insertions, 0 deletions
diff --git a/doc/classes/Input.xml b/doc/classes/Input.xml index a4346c1485..1eb74446c6 100644 --- a/doc/classes/Input.xml +++ b/doc/classes/Input.xml @@ -293,6 +293,8 @@ </argument> <description> Set a custom mouse cursor image, which is only visible inside the game window. The hotspot can also be specified. Passing [code]null[/code] to the image parameter resets to the system cursor. See enum [code]CURSOR_*[/code] for the list of shapes. + [code]image[/code]'s size must be lower than 256x256. + [code]hotspot[/code] must be within [code]image[/code]'s size. </description> </method> <method name="set_default_cursor_shape"> diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 79d7ec410a..16f1ff8e11 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -1605,6 +1605,7 @@ void OS_OSX::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, c ERR_FAIL_COND(!texture.is_valid()); ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256); + ERR_FAIL_COND(p_hotspot.x > texture_size.width || p_hotspot.y > texture_size.height); image = texture->get_data(); diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 4ca6f36629..9d5cae00e8 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -2253,6 +2253,7 @@ void OS_Windows::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shap ERR_FAIL_COND(!texture.is_valid()); ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256); + ERR_FAIL_COND(p_hotspot.x > texture_size.width || p_hotspot.y > texture_size.height); image = texture->get_data(); diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index a62bd714d2..606a2371fe 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -2535,6 +2535,7 @@ void OS_X11::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, c ERR_FAIL_COND(!texture.is_valid()); ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256); + ERR_FAIL_COND(p_hotspot.x > texture_size.width || p_hotspot.y > texture_size.height); image = texture->get_data(); |