diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-04-10 08:07:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-10 08:07:50 +0200 |
| commit | b1d4e1be6dc6fbe839d0eb57c71e502df333c1fa (patch) | |
| tree | 848c72fe2ffb931b689b7df579b47246a70613ac | |
| parent | 2cfc284d52e86dea2ba74d8d8c34261729e07b57 (diff) | |
| parent | 19d2a44e5db9706180861d60958ae7f8592475ea (diff) | |
Merge pull request #18089 from guilhermefelipecgs/same_cursor_to_diferent_shape
Allow set_custom_mouse_cursor to 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 { |