godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #53468 from KoBeWi/crossdrag

This commit is contained in:
Rémi Verschelde 2021-10-06 14:17:33 +02:00 committed by GitHub
parent 36de097577 92a53f9bd6
commit 18c1e80141
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/classes/Input.xml
View File

@ -386,6 +386,7 @@
</constant> </constant>
<constant name="CURSOR_DRAG" value="6" enum="CursorShape"> <constant name="CURSOR_DRAG" value="6" enum="CursorShape">
Drag cursor. Usually displayed when dragging something. Drag cursor. Usually displayed when dragging something.
[b]Note:[/b] Windows lacks a dragging cursor, so [constant CURSOR_DRAG] is the same as [constant CURSOR_MOVE] for this platform.
</constant> </constant>
<constant name="CURSOR_CAN_DROP" value="7" enum="CursorShape"> <constant name="CURSOR_CAN_DROP" value="7" enum="CursorShape">
Can drop cursor. Usually displayed when dragging something to indicate that it can be dropped at the current position. Can drop cursor. Usually displayed when dragging something to indicate that it can be dropped at the current position.

2
platform/windows/display_server_windows.cpp
View File

@ -1208,7 +1208,7 @@ void DisplayServerWindows::cursor_set_shape(CursorShape p_shape) {
IDC_CROSS, IDC_CROSS,
IDC_WAIT, IDC_WAIT,
IDC_APPSTARTING, IDC_APPSTARTING,
IDC_ARROW, IDC_SIZEALL,
IDC_ARROW, IDC_ARROW,
IDC_NO, IDC_NO,
IDC_SIZENS, IDC_SIZENS,