From bc31be9812b165c677584a2be81a5a9bd71d8ecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 9 May 2016 22:20:35 +0200 Subject: Sync classes.xml with current sources Also fix a typo in the binding of Control::set_drag_forwarding. --- doc/base/classes.xml | 160 +++++++++++++++++++++++++++++++++++++++----------- scene/gui/control.cpp | 2 +- 2 files changed, 128 insertions(+), 34 deletions(-) diff --git a/doc/base/classes.xml b/doc/base/classes.xml index 529601c741..643658fbb9 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -2680,6 +2680,22 @@ Get the list of names of the animations stored in the player. + + + + + + + + + + + + + + + + @@ -6766,9 +6782,9 @@ - + - + @@ -6781,9 +6797,9 @@ - + - + Draw a polygon of any amount of points, convex or concave. @@ -6794,9 +6810,9 @@ - + - + Draw a colored polygon of any amount of points, convex or concave. @@ -7118,7 +7134,7 @@ - + Set the base rotation for this layer (helper). @@ -7131,6 +7147,18 @@ Return the base rotation for this layer (helper). + + + + + + + + + + + + @@ -7146,7 +7174,7 @@ - + Return the [World2D] used by this layer. @@ -8779,7 +8807,13 @@ - + + + + + + + @@ -8832,6 +8866,12 @@ + + + + + + @@ -9175,6 +9215,12 @@ + + + + + + @@ -14065,6 +14111,20 @@ Returns an empty String "" at the end of the list. + + + + + + + + + + + + + + @@ -14688,6 +14748,10 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) + + + + @@ -15208,13 +15272,13 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - Makes the mouse cursor visible if it is hidden. + Makes the mouse cursor visible if it is hidden. - Makes the mouse cursor hidden if it is visible. + Makes the mouse cursor hidden if it is visible. - Captures the mouse. The mouse will be hidden and unable to leave the game window. But it will still register movement and mouse button presses. + Captures the mouse. The mouse will be hidden and unable to leave the game window. But it will still register movement and mouse button presses. @@ -16377,7 +16441,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - + @@ -17963,38 +18027,38 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - Simple button used to represent a link to some resource + Simple button used to represent a link to some resource - This kind of buttons are primarily used when the interaction with the button causes a context change (like linking to a web page). + This kind of buttons are primarily used when the interaction with the button causes a context change (like linking to a web page). - Sets the text of the button. + Sets the text of the button. - Returns the text of the button. + Returns the text of the button. - Sets the underline mode for this button, the argument must be one of the [LinkButton] constants (see constants section). + Sets the underline mode for this button, the argument must be one of the [LinkButton] constants (see constants section). - Returns the underline mode for this button. + Returns the underline mode for this button. @@ -20246,7 +20310,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - + Return the parent [Node] of the current [Node], or an empty Object if the node lacks a parent. @@ -20639,12 +20703,18 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - + Set the rotation of the 2D node. + + + + + + @@ -20666,6 +20736,12 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) Return the rotation of the 2D node. + + + + + + @@ -21029,7 +21105,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - Sets the window size to the specified size. + Sets the window size to the specified size. @@ -21107,7 +21183,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - Returns the current screen orientation, the return value will be one of the SCREEN_ORIENTATION constants in this class. + Returns the current screen orientation, the return value will be one of the SCREEN_ORIENTATION constants in this class. @@ -25033,7 +25109,7 @@ This method controls whether the position between two cached points is interpola - + @@ -33787,7 +33863,7 @@ This method controls whether the position between two cached points is interpola - + @@ -33798,6 +33874,18 @@ This method controls whether the position between two cached points is interpola + + + + + + + + + + + + @@ -34183,13 +34271,13 @@ This method controls whether the position between two cached points is interpola - + - + @@ -36479,11 +36567,11 @@ This method controls whether the position between two cached points is interpola - + - + @@ -36513,7 +36601,7 @@ This method controls whether the position between two cached points is interpola - + @@ -39130,7 +39218,7 @@ This method controls whether the position between two cached points is interpola - + @@ -41264,13 +41352,13 @@ This method controls whether the position between two cached points is interpola - + - + @@ -42087,6 +42175,12 @@ This method controls whether the position between two cached points is interpola + + + + + + diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index 047b854862..d0e5e8b7ae 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -2320,7 +2320,7 @@ void Control::_bind_methods() { ObjectTypeDB::bind_method(_MD("grab_click_focus"),&Control::grab_click_focus); - ObjectTypeDB::bind_method(_MD("set_drag_forwarding;","target:Control"),&Control::set_drag_forwarding); + ObjectTypeDB::bind_method(_MD("set_drag_forwarding","target:Control"),&Control::set_drag_forwarding); ObjectTypeDB::bind_method(_MD("set_drag_preview","control:Control"),&Control::set_drag_preview); ObjectTypeDB::bind_method(_MD("warp_mouse","to_pos"),&Control::warp_mouse); -- cgit v1.2.3