Renamed the render_menu property in UserWebPage to should_render_menu…

…, as there is a render_menu method in WebNode.
Relintai · Jul 19, 2024 · 82296c9 · 82296c9
1 parent f93f0e1
commit 82296c9
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 14 deletions.
diff --git a/modules/users/web/web_nodes/user_web_page.cpp b/modules/users/web/web_nodes/user_web_page.cpp
@@ -1,4 +1,4 @@
-/*************************************************************************/
+//
 /*  user_web_page.cpp                                                    */
 /*************************************************************************/
 /*                         This file is part of:                         */
@@ -77,11 +77,11 @@ void UserWebPage::set_logged_in_error_code(const int val) {
 	_logged_in_error_code = val;
 }
 
-bool UserWebPage::get_render_menu() {
-	return _render_menu;
+bool UserWebPage::get_should_render_menu() {
+	return _should_render_menu;
 }
-void UserWebPage::set_render_menu(const bool val) {
-	_render_menu = val;
+void UserWebPage::set_should_render_menu(const bool val) {
+	_should_render_menu = val;
 }
 
 void UserWebPage::_handle_request(Ref<WebServerRequest> request) {
@@ -111,7 +111,7 @@ void UserWebPage::handle_not_logged_in(Ref<WebServerRequest> request) {
 void UserWebPage::_handle_not_logged_in(Ref<WebServerRequest> request) {
 	switch (_logged_out_render_type) {
 		case RENDER_TYPE_RENDER:
-			if (_render_menu) {
+			if (_should_render_menu) {
 				render_menu(request);
 			}
 
@@ -136,7 +136,7 @@ void UserWebPage::handle_logged_in(Ref<WebServerRequest> request) {
 void UserWebPage::_handle_logged_in(Ref<WebServerRequest> request) {
 	switch (_logged_in_render_type) {
 		case RENDER_TYPE_RENDER:
-			if (_render_menu) {
+			if (_should_render_menu) {
 				render_menu(request);
 			}
 
@@ -161,12 +161,22 @@ UserWebPage::UserWebPage() {
 	_logged_in_render_type = RENDER_TYPE_RENDER;
 	_logged_in_error_code = 404;
 
-	_render_menu = true;
+	_should_render_menu = true;
 }
 
 UserWebPage::~UserWebPage() {
 }
 
+#ifndef DISABLE_DEPRECATED
+bool UserWebPage::_set(const StringName &p_name, const Variant &p_value) {
+	if (p_name == "render_menu") {
+		_should_render_menu = p_value;
+		return true;
+	}
+	return false;
+}
+#endif // DISABLE_DEPRECATED
+
 void UserWebPage::_bind_methods() {
 	BIND_VMETHOD(MethodInfo("_render_user_page", PropertyInfo(Variant::OBJECT, "request", PROPERTY_HINT_RESOURCE_TYPE, "WebServerRequest"), PropertyInfo(Variant::DICTIONARY, "data")));
 
@@ -194,9 +204,9 @@ void UserWebPage::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_logged_in_error_code", "val"), &UserWebPage::set_logged_in_error_code);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "logged_in_error_code"), "set_logged_in_error_code", "get_logged_in_error_code");
 
-	ClassDB::bind_method(D_METHOD("get_render_menu"), &UserWebPage::get_render_menu);
-	ClassDB::bind_method(D_METHOD("set_render_menu", "val"), &UserWebPage::set_render_menu);
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "render_menu"), "set_render_menu", "get_render_menu");
+	ClassDB::bind_method(D_METHOD("get_should_render_menu"), &UserWebPage::get_should_render_menu);
+	ClassDB::bind_method(D_METHOD("set_should_render_menu", "val"), &UserWebPage::set_should_render_menu);
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "should_render_menu"), "set_should_render_menu", "get_should_render_menu");
 
 	BIND_VMETHOD(MethodInfo("_handle_not_logged_in", PropertyInfo(Variant::OBJECT, "request", PROPERTY_HINT_RESOURCE_TYPE, "WebServerRequest")));
 	ClassDB::bind_method(D_METHOD("handle_not_logged_in", "request"), &UserWebPage::handle_not_logged_in);

diff --git a/modules/users/web/web_nodes/user_web_page.h b/modules/users/web/web_nodes/user_web_page.h
@@ -68,8 +68,8 @@ class UserWebPage : public WebNode {
 	int get_logged_in_error_code();
 	void set_logged_in_error_code(const int val);
 
-	bool get_render_menu();
-	void set_render_menu(const bool val);
+	bool get_should_render_menu();
+	void set_should_render_menu(const bool val);
 
 	void _handle_request(Ref<WebServerRequest> request);
 	void _render_index(Ref<WebServerRequest> request);
@@ -84,9 +84,13 @@ class UserWebPage : public WebNode {
 	~UserWebPage();
 
 protected:
+#ifndef DISABLE_DEPRECATED
+	bool _set(const StringName &p_name, const Variant &p_value);
+#endif // DISABLE_DEPRECATED
+
 	static void _bind_methods();
 
-	bool _render_menu;
+	bool _should_render_menu;
 
 	RenderType _logged_out_render_type;
 	String _logged_out_redirect_url;