summaryrefslogtreecommitdiff
path: root/main/input_default.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-09-19 09:26:21 +0200
committerGitHub <noreply@github.com>2018-09-19 09:26:21 +0200
commit0274ded34cc0205ac14bc20c84b5a44dee5f99e4 (patch)
treee767a760849bf3226f0ffb70e10defcb9edf9f95 /main/input_default.cpp
parentd3e24581b923724832daa01cb45ff3bd3470b26a (diff)
parent64cecf9d61eccb45f939b33cc752f336682cdda1 (diff)
Merge pull request #22070 from capnm/fix_Input.set_default_cursor_shape_take2
Fix set_default_cursor_shape interaction with Control nodes
Diffstat (limited to 'main/input_default.cpp')
-rw-r--r--main/input_default.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/main/input_default.cpp b/main/input_default.cpp
index 2efbb3f849..10be291b8d 100644
--- a/main/input_default.cpp
+++ b/main/input_default.cpp
@@ -598,7 +598,13 @@ Input::CursorShape InputDefault::get_default_cursor_shape() {
void InputDefault::set_default_cursor_shape(CursorShape p_shape) {
default_shape = p_shape;
- OS::get_singleton()->set_cursor_shape((OS::CursorShape)p_shape);
+ // The default shape is set in Viewport::_gui_input_event. To instantly
+ // see the shape in the viewport we need to trigger a mouse motion event.
+ Ref<InputEventMouseMotion> mm;
+ mm.instance();
+ mm->set_position(mouse_pos);
+ mm->set_global_position(mouse_pos);
+ parse_input_event(mm);
}
void InputDefault::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot) {