From 19d2a44e5db9706180861d60958ae7f8592475ea Mon Sep 17 00:00:00 2001 From: Guilherme Felipe Date: Mon, 9 Apr 2018 14:33:13 -0300 Subject: [PATCH] Allow set_custom_mouse_cursor use same cursor(image) with different shapes. --- main/input_default.cpp | 9 --------- main/input_default.h | 1 - 2 files changed, 10 deletions(-) diff --git a/main/input_default.cpp b/main/input_default.cpp index c3bc83b2dee..ae330579596 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 0479fdc0ff0..7de6d3eca0d 100644 --- a/main/input_default.h +++ b/main/input_default.h @@ -115,7 +115,6 @@ class InputDefault : public Input { SpeedTrack mouse_speed_track; Map joy_names; int fallback_mapping; - RES custom_cursor; public: enum HatMask {