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

doc: Sync classref with current source 

Also apply clang-format.
This commit is contained in:
Rémi Verschelde 2019-12-13 10:37:59 +01:00
parent d31ff039ed
commit 9f68626fb2
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
doc/classes/Tween.xml
View File

@ -34,9 +34,9 @@
</argument>
<argument index="5" name="duration" type="float">
</argument>
<argument index="6" name="trans_type" type="int" enum="Tween.TransitionType">
<argument index="6" name="trans_type" type="int" enum="Tween.TransitionType" default="0">
</argument>
<argument index="7" name="ease_type" type="int" enum="Tween.EaseType">
<argument index="7" name="ease_type" type="int" enum="Tween.EaseType" default="2">
</argument>
<argument index="8" name="delay" type="float" default="0">
</argument>
@ -60,9 +60,9 @@
</argument>
<argument index="5" name="duration" type="float">
</argument>
<argument index="6" name="trans_type" type="int" enum="Tween.TransitionType">
<argument index="6" name="trans_type" type="int" enum="Tween.TransitionType" default="0">
</argument>
<argument index="7" name="ease_type" type="int" enum="Tween.EaseType">
<argument index="7" name="ease_type" type="int" enum="Tween.EaseType" default="2">
</argument>
<argument index="8" name="delay" type="float" default="0">
</argument>
@ -137,9 +137,9 @@
</argument>
<argument index="4" name="duration" type="float">
</argument>
<argument index="5" name="trans_type" type="int" enum="Tween.TransitionType">
<argument index="5" name="trans_type" type="int" enum="Tween.TransitionType" default="0">
</argument>
<argument index="6" name="ease_type" type="int" enum="Tween.EaseType">
<argument index="6" name="ease_type" type="int" enum="Tween.EaseType" default="2">
</argument>
<argument index="7" name="delay" type="float" default="0">
</argument>
@ -161,9 +161,9 @@
</argument>
<argument index="4" name="duration" type="float">
</argument>
<argument index="5" name="trans_type" type="int" enum="Tween.TransitionType">
<argument index="5" name="trans_type" type="int" enum="Tween.TransitionType" default="0">
</argument>
<argument index="6" name="ease_type" type="int" enum="Tween.EaseType">
<argument index="6" name="ease_type" type="int" enum="Tween.EaseType" default="2">
</argument>
<argument index="7" name="delay" type="float" default="0">
</argument>
@ -292,9 +292,9 @@
</argument>
<argument index="5" name="duration" type="float">
</argument>
<argument index="6" name="trans_type" type="int" enum="Tween.TransitionType">
<argument index="6" name="trans_type" type="int" enum="Tween.TransitionType" default="0">
</argument>
<argument index="7" name="ease_type" type="int" enum="Tween.EaseType">
<argument index="7" name="ease_type" type="int" enum="Tween.EaseType" default="2">
</argument>
<argument index="8" name="delay" type="float" default="0">
</argument>
@ -318,9 +318,9 @@
</argument>
<argument index="5" name="duration" type="float">
</argument>
<argument index="6" name="trans_type" type="int" enum="Tween.TransitionType">
<argument index="6" name="trans_type" type="int" enum="Tween.TransitionType" default="0">
</argument>
<argument index="7" name="ease_type" type="int" enum="Tween.EaseType">
<argument index="7" name="ease_type" type="int" enum="Tween.EaseType" default="2">
</argument>
<argument index="8" name="delay" type="float" default="0">
</argument>

2
doc/classes/VisualShaderNodeTexture.xml
View File

@ -28,6 +28,8 @@
</constant>
<constant name="SOURCE_DEPTH" value="4" enum="Source">
</constant>
<constant name="SOURCE_PORT" value="5" enum="Source">
</constant>
<constant name="TYPE_DATA" value="0" enum="TextureType">
</constant>
<constant name="TYPE_COLOR" value="1" enum="TextureType">

3
modules/mono/mono_gd/gd_mono_android.cpp
View File

@ -81,7 +81,8 @@ struct ScopedLocalRef {
ScopedLocalRef &operator=(const ScopedLocalRef &) = delete;
ScopedLocalRef(JNIEnv *p_env, T p_local_ref) :
env(p_env), local_ref(p_local_ref) {
env(p_env),
local_ref(p_local_ref) {
}
~ScopedLocalRef() {

2
scene/gui/popup_menu.cpp
View File

@ -202,7 +202,7 @@ void PopupMenu::_scroll(float p_factor, const Point2 &p_over) {
} else if (dy < 0) {
const float global_bottom = get_global_position().y + get_size().y * get_global_transform().get_scale().y;
const float viewport_height = get_viewport_rect().size.y;
const float limit = global_bottom > viewport_height ? global_bottom - viewport_height: 0;
const float limit = global_bottom > viewport_height ? global_bottom - viewport_height : 0;
dy = -MIN(-dy, limit);
}
set_position(get_position() + Vector2(0, dy));