diff options
author | Guilherme Felipe <guilhermefelipecgs@gmail.com> | 2018-04-09 14:33:13 -0300 |
---|---|---|
committer | Guilherme Felipe <guilhermefelipecgs@gmail.com> | 2018-04-09 14:33:13 -0300 |
commit | 19d2a44e5db9706180861d60958ae7f8592475ea (patch) | |
tree | c214bda612536e5ae62b998cb9b3b0a70ab6df86 | |
parent | 36552c2c90a8fb714d2fd8aec37e4bd2f876b090 (diff) |
Allow set_custom_mouse_cursor use same cursor(image) with different shapes.
-rw-r--r-- | main/input_default.cpp | 9 | ||||
-rw-r--r-- | main/input_default.h | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/main/input_default.cpp b/main/input_default.cpp index c3bc83b2de..ae33057959 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -413,10 +413,6 @@ void InputDefault::set_mouse_position(const Point2 &p_posf) { mouse_speed_track.update(p_posf - mouse_pos); mouse_pos = p_posf; - if (custom_cursor.is_valid()) { - //removed, please insist that we implement hardware cursors - // VisualServer::get_singleton()->cursor_set_pos(get_mouse_position()); - } } Point2 InputDefault::get_mouse_position() const { @@ -503,11 +499,6 @@ void InputDefault::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_sh if (Engine::get_singleton()->is_editor_hint()) return; - if (custom_cursor == p_cursor) - return; - - custom_cursor = p_cursor; - OS::get_singleton()->set_custom_mouse_cursor(p_cursor, (OS::CursorShape)p_shape, p_hotspot); } diff --git a/main/input_default.h b/main/input_default.h index 0479fdc0ff..7de6d3eca0 100644 --- a/main/input_default.h +++ b/main/input_default.h @@ -115,7 +115,6 @@ class InputDefault : public Input { SpeedTrack mouse_speed_track; Map<int, Joypad> joy_names; int fallback_mapping; - RES custom_cursor; public: enum HatMask { |