From 9f68626fb2e5331d4bea1adea49d014be79af4b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Fri, 13 Dec 2019 10:37:59 +0100
Subject: doc: Sync classref with current source

Also apply clang-format.
---
 doc/classes/Tween.xml                    | 24 ++++++++++++------------
 doc/classes/VisualShaderNodeTexture.xml  |  2 ++
 modules/mono/mono_gd/gd_mono_android.cpp |  3 ++-
 scene/gui/popup_menu.cpp                 |  2 +-
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/doc/classes/Tween.xml b/doc/classes/Tween.xml
index aa995e6cbe..cf75e71358 100644
--- a/doc/classes/Tween.xml
+++ b/doc/classes/Tween.xml
@@ -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>
diff --git a/doc/classes/VisualShaderNodeTexture.xml b/doc/classes/VisualShaderNodeTexture.xml
index a94b798745..4150b36c9c 100644
--- a/doc/classes/VisualShaderNodeTexture.xml
+++ b/doc/classes/VisualShaderNodeTexture.xml
@@ -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">
diff --git a/modules/mono/mono_gd/gd_mono_android.cpp b/modules/mono/mono_gd/gd_mono_android.cpp
index 86af8d1812..29ae4856be 100644
--- a/modules/mono/mono_gd/gd_mono_android.cpp
+++ b/modules/mono/mono_gd/gd_mono_android.cpp
@@ -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() {
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp
index cffea527a5..5561bce714 100644
--- a/scene/gui/popup_menu.cpp
+++ b/scene/gui/popup_menu.cpp
@@ -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));
-- 
cgit v1.2.3