summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-10-06 14:17:33 +0200
committerGitHub <noreply@github.com>2021-10-06 14:17:33 +0200
commit18c1e8014155f7711e752f5d3eade7ddda887b0d (patch)
tree63136e7ca720f066f4bd6afda40d0371b1af7dbb
parent36de097577811eb39d1a8d31d10d538ad70675d9 (diff)
parent92a53f9bd6a13e98f0b8e4d341d53ffd7355d1d0 (diff)
Merge pull request #53468 from KoBeWi/crossdrag
-rw-r--r--doc/classes/Input.xml1
-rw-r--r--platform/windows/display_server_windows.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/classes/Input.xml b/doc/classes/Input.xml
index ebbcd2b894..dd3f7266bd 100644
--- a/doc/classes/Input.xml
+++ b/doc/classes/Input.xml
@@ -386,6 +386,7 @@
</constant>
<constant name="CURSOR_DRAG" value="6" enum="CursorShape">
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 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.
diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp
index 8a946d8136..905c4142a8 100644
--- a/platform/windows/display_server_windows.cpp
+++ b/platform/windows/display_server_windows.cpp
@@ -1208,7 +1208,7 @@ void DisplayServerWindows::cursor_set_shape(CursorShape p_shape) {
IDC_CROSS,
IDC_WAIT,
IDC_APPSTARTING,
- IDC_ARROW,
+ IDC_SIZEALL,
IDC_ARROW,
IDC_NO,
IDC_SIZENS,