godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

Allow set_custom_mouse_cursor use same cursor(image) with different shapes.

Browse Source
This commit is contained in:
Guilherme Felipe
2018-04-09 14:33:13 -03:00
parent 36552c2c90
commit 19d2a44e5d
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/input_default.cpp
View File

@@ -413,10 +413,6 @@ void InputDefault::set_mouse_position(const Point2 &p_posf) {
mouse_speed_track.update(p_posf - mouse_pos); mouse_speed_track.update(p_posf - mouse_pos);
mouse_pos = p_posf; 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 { 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()) if (Engine::get_singleton()->is_editor_hint())
return; 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); OS::get_singleton()->set_custom_mouse_cursor(p_cursor, (OS::CursorShape)p_shape, p_hotspot);
} }

1
main/input_default.h
View File

@@ -115,7 +115,6 @@ class InputDefault : public Input {
SpeedTrack mouse_speed_track; SpeedTrack mouse_speed_track;
Map<int, Joypad> joy_names; Map<int, Joypad> joy_names;
int fallback_mapping; int fallback_mapping;
RES custom_cursor;
public: public:
enum HatMask { enum HatMask {