From 0b8cb945cf0d65a9061dee7c780a405d4b26ef00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 20 May 2020 15:29:37 +0200 Subject: [PATCH] doc: Sync classref with current source --- doc/classes/DisplayServer.xml | 4 ++++ doc/classes/KinematicBody3D.xml | 16 ++++++++-------- doc/classes/OS.xml | 2 +- doc/classes/PopupMenu.xml | 2 +- doc/classes/ProjectSettings.xml | 2 +- servers/display_server.cpp | 4 ++-- servers/display_server.h | 2 +- 7 files changed, 18 insertions(+), 14 deletions(-) diff --git a/doc/classes/DisplayServer.xml b/doc/classes/DisplayServer.xml index 90828089f97..7fe712753c4 100644 --- a/doc/classes/DisplayServer.xml +++ b/doc/classes/DisplayServer.xml @@ -592,6 +592,10 @@ + + + + diff --git a/doc/classes/KinematicBody3D.xml b/doc/classes/KinematicBody3D.xml index 830d63ed115..5477c6bab6e 100644 --- a/doc/classes/KinematicBody3D.xml +++ b/doc/classes/KinematicBody3D.xml @@ -18,7 +18,7 @@ - Returns [code]true[/code] if the specified [code]axis[/code] is locked. See also [member move_lock_x], [member move_lock_y] and [member move_lock_z]. + Returns [code]true[/code] if the specified [code]axis[/code] is locked. See also [member axis_lock_motion_x], [member axis_lock_motion_y] and [member axis_lock_motion_z]. @@ -145,7 +145,7 @@ - Locks or unlocks the specified [code]axis[/code] depending on the value of [code]lock[/code]. See also [member move_lock_x], [member move_lock_y] and [member move_lock_z]. + Locks or unlocks the specified [code]axis[/code] depending on the value of [code]lock[/code]. See also [member axis_lock_motion_x], [member axis_lock_motion_y] and [member axis_lock_motion_z]. @@ -163,18 +163,18 @@ - - If the body is at least this close to another body, this body will consider them to be colliding. - - + Lock the body's X axis movement. - + Lock the body's Y axis movement. - + Lock the body's Z axis movement. + + If the body is at least this close to another body, this body will consider them to be colliding. + diff --git a/doc/classes/OS.xml b/doc/classes/OS.xml index f13671ca96d..03203e2ebb9 100644 --- a/doc/classes/OS.xml +++ b/doc/classes/OS.xml @@ -518,7 +518,7 @@ The amount of sleeping between frames when the low-processor usage mode is enabled (in microseconds). Higher values will result in lower CPU usage. - + The current tablet drvier in use. diff --git a/doc/classes/PopupMenu.xml b/doc/classes/PopupMenu.xml index 59450b7ea26..ce55c90c682 100644 --- a/doc/classes/PopupMenu.xml +++ b/doc/classes/PopupMenu.xml @@ -591,7 +591,7 @@ - + If [code]true[/code], allows to navigate [PopupMenu] with letter keys. diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml index 7c07875ffb1..daf8cb1d2fc 100644 --- a/doc/classes/ProjectSettings.xml +++ b/doc/classes/ProjectSettings.xml @@ -450,7 +450,7 @@ Sets the game's main viewport width. On desktop platforms, this is the default window size. Stretch mode settings also use this as a reference when enabled. - + Specifies the tablet driver to use. If left empty, the default driver will be used. diff --git a/servers/display_server.cpp b/servers/display_server.cpp index bd9da6156f2..cc818cbe042 100644 --- a/servers/display_server.cpp +++ b/servers/display_server.cpp @@ -213,7 +213,7 @@ bool DisplayServer::is_console_visible() const { return false; } -void DisplayServer::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, int p_max_legth, int p_cursor_start, int p_cursor_end) { +void DisplayServer::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, int p_max_length, int p_cursor_start, int p_cursor_end) { WARN_PRINT("Virtual keyboard not supported by this display server."); } @@ -439,7 +439,7 @@ void DisplayServer::_bind_methods() { ClassDB::bind_method(D_METHOD("console_set_visible", "console_visible"), &DisplayServer::console_set_visible); ClassDB::bind_method(D_METHOD("is_console_visible"), &DisplayServer::is_console_visible); - ClassDB::bind_method(D_METHOD("virtual_keyboard_show", "existing_text", "position", "max_length"), &DisplayServer::virtual_keyboard_show, DEFVAL(Rect2i()), DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("virtual_keyboard_show", "existing_text", "position", "max_length", "cursor_start", "cursor_end"), &DisplayServer::virtual_keyboard_show, DEFVAL(Rect2i()), DEFVAL(-1), DEFVAL(-1), DEFVAL(-1)); ClassDB::bind_method(D_METHOD("virtual_keyboard_hide"), &DisplayServer::virtual_keyboard_hide); ClassDB::bind_method(D_METHOD("virtual_keyboard_get_height"), &DisplayServer::virtual_keyboard_get_height); diff --git a/servers/display_server.h b/servers/display_server.h index be1014736f1..b25b1931c8c 100644 --- a/servers/display_server.h +++ b/servers/display_server.h @@ -280,7 +280,7 @@ public: virtual void console_set_visible(bool p_enabled); virtual bool is_console_visible() const; - virtual void virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect = Rect2(), int p_max_legth = -1, int p_cursor_start = -1, int p_cursor_end = -1); + virtual void virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect = Rect2(), int p_max_length = -1, int p_cursor_start = -1, int p_cursor_end = -1); virtual void virtual_keyboard_hide(); // returns height of the currently shown virtual keyboard (0 if keyboard is hidden)