summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-03-28 08:52:02 +0200
committerGitHub <noreply@github.com>2022-03-28 08:52:02 +0200
commit00e9170812a528c6cb33e5a2b197f2055e528692 (patch)
tree6614a8b64d3d2fc844efa24130ba56ba79350e94 /doc
parenta0071029f2c4ec006d3443f25aa77e2c2c7a1ece (diff)
parent0494e024d8cf244f82f8f4b4318f8558375f99ff (diff)
Merge pull request #59574 from Sauermann/proposal-rename-warp-mouse
Rename warp mouse functions to warp_mouse
Diffstat (limited to 'doc')
-rw-r--r--doc/classes/Control.xml4
-rw-r--r--doc/classes/DisplayServer.xml14
-rw-r--r--doc/classes/Input.xml6
-rw-r--r--doc/classes/Viewport.xml2
4 files changed, 13 insertions, 13 deletions
diff --git a/doc/classes/Control.xml b/doc/classes/Control.xml
index 3163ac5610..78150af9dd 100644
--- a/doc/classes/Control.xml
+++ b/doc/classes/Control.xml
@@ -943,9 +943,9 @@
</method>
<method name="warp_mouse">
<return type="void" />
- <argument index="0" name="to_position" type="Vector2" />
+ <argument index="0" name="position" type="Vector2" />
<description>
- Moves the mouse cursor to [code]to_position[/code], relative to [member position] of this [Control].
+ Moves the mouse cursor to [code]position[/code], relative to [member position] of this [Control].
</description>
</method>
</methods>
diff --git a/doc/classes/DisplayServer.xml b/doc/classes/DisplayServer.xml
index 47bc496100..16a2019149 100644
--- a/doc/classes/DisplayServer.xml
+++ b/doc/classes/DisplayServer.xml
@@ -670,13 +670,6 @@
<description>
</description>
</method>
- <method name="mouse_warp_to_position">
- <return type="void" />
- <argument index="0" name="position" type="Vector2i" />
- <description>
- Sets the mouse cursor position to the given [code]position[/code].
- </description>
- </method>
<method name="process_events">
<return type="void" />
<description>
@@ -852,6 +845,13 @@
[b]Note:[/b] This method is implemented on Android, iOS and UWP.
</description>
</method>
+ <method name="warp_mouse">
+ <return type="void" />
+ <argument index="0" name="position" type="Vector2i" />
+ <description>
+ Sets the mouse cursor position to the given [code]position[/code] relative to an origin at the upper left corner of the currently focused game Window Manager window.
+ </description>
+ </method>
<method name="window_attach_instance_id">
<return type="void" />
<argument index="0" name="instance_id" type="int" />
diff --git a/doc/classes/Input.xml b/doc/classes/Input.xml
index 64a914bb31..c3552c9f62 100644
--- a/doc/classes/Input.xml
+++ b/doc/classes/Input.xml
@@ -379,11 +379,11 @@
[b]Note:[/b] It needs [code]VIBRATE[/code] permission for Android at export settings. iOS does not support duration.
</description>
</method>
- <method name="warp_mouse_position">
+ <method name="warp_mouse">
<return type="void" />
- <argument index="0" name="to" type="Vector2" />
+ <argument index="0" name="position" type="Vector2" />
<description>
- Sets the mouse position to the specified vector, provided in pixels and relative to an origin at the upper left corner of the game window.
+ Sets the mouse position to the specified vector, provided in pixels and relative to an origin at the upper left corner of the currently focused Window Manager game window.
Mouse position is clipped to the limits of the screen resolution, or to the limits of the game window if [enum MouseMode] is set to [code]MOUSE_MODE_CONFINED[/code] or [code]MOUSE_MODE_CONFINED_HIDDEN[/code].
</description>
</method>
diff --git a/doc/classes/Viewport.xml b/doc/classes/Viewport.xml
index a72e7f1eb0..b5916f8c17 100644
--- a/doc/classes/Viewport.xml
+++ b/doc/classes/Viewport.xml
@@ -172,7 +172,7 @@
</method>
<method name="warp_mouse">
<return type="void" />
- <argument index="0" name="to_position" type="Vector2" />
+ <argument index="0" name="position" type="Vector2" />
<description>
Moves the mouse pointer to the specified position in this [Viewport] using the coordinate system of this [Viewport].
</description>