4 files changed, 24 insertions, 17 deletions

diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp
index 3d95677dcf..af6a99ca62 100644
--- a/scene/gui/base_button.cpp
+++ b/scene/gui/base_button.cpp
@@ -264,7 +264,7 @@ bool BaseButton::is_hovered() const {
 BaseButton::DrawMode BaseButton::get_draw_mode() const {
 	if (status.disabled) {
 		return DRAW_DISABLED;
-	};
+	}
 
 	if (!status.press_attempt && status.hovering) {
 		if (status.pressed) {
@@ -273,8 +273,7 @@ BaseButton::DrawMode BaseButton::get_draw_mode() const {
 
 		return DRAW_HOVER;
 	} else {
-		/* determine if pressed or not */
-
+		// Determine if pressed or not.
 		bool pressing;
 		if (status.press_attempt) {
 			pressing = (status.pressing_inside || keep_pressed_outside);
@@ -291,8 +290,6 @@ BaseButton::DrawMode BaseButton::get_draw_mode() const {
 			return DRAW_NORMAL;
 		}
 	}
-
-	return DRAW_NORMAL;
 }
 
 void BaseButton::set_toggle_mode(bool p_on) {
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index ae94be8437..dc9294df6d 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -2225,7 +2225,19 @@ void Control::_window_find_focus_neighbor(const Vector2 &p_dir, Node *p_at, cons
 void Control::set_default_cursor_shape(CursorShape p_shape) {
 	ERR_FAIL_INDEX(int(p_shape), CURSOR_MAX);
 
+	if (data.default_cursor == p_shape) {
+		return;
+	}
 	data.default_cursor = p_shape;
+
+	if (!is_inside_tree()) {
+		return;
+	}
+	if (!get_global_rect().has_point(get_global_mouse_position())) {
+		return;
+	}
+
+	get_viewport()->get_base_window()->update_mouse_cursor_shape();
 }
 
 Control::CursorShape Control::get_default_cursor_shape() const {
diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp
index 57f27e299f..cf7f439aef 100644
--- a/scene/gui/file_dialog.cpp
+++ b/scene/gui/file_dialog.cpp
@@ -172,18 +172,20 @@ void FileDialog::shortcut_input(const Ref<InputEvent> &p_event) {
 
 void FileDialog::set_enable_multiple_selection(bool p_enable) {
 	tree->set_select_mode(p_enable ? Tree::SELECT_MULTI : Tree::SELECT_SINGLE);
-};
+}
 
 Vector<String> FileDialog::get_selected_files() const {
 	Vector<String> list;
 
 	TreeItem *item = tree->get_root();
-	while ((item = tree->get_next_selected(item))) {
+	item = tree->get_next_selected(item);
+	while (item) {
 		list.push_back(dir_access->get_current_dir().path_join(item->get_text(0)));
-	};
+		item = tree->get_next_selected(item);
+	}
 
 	return list;
-};
+}
 
 void FileDialog::update_dir() {
 	if (root_prefix.is_empty()) {
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
index 8bccf3ada1..7ea46a0b4f 100644
--- a/scene/gui/rich_text_label.cpp
+++ b/scene/gui/rich_text_label.cpp
@@ -52,7 +52,7 @@ RichTextLabel::Item *RichTextLabel::_get_next_item(Item *p_item, bool p_free) co
 		} else if (p_item->E->next()) {
 			return p_item->E->next()->get();
 		} else {
-			//go up until something with a next is found
+			// Go up until something with a next is found.
 			while (p_item->parent && !p_item->E->next()) {
 				p_item = p_item->parent;
 			}
@@ -72,7 +72,7 @@ RichTextLabel::Item *RichTextLabel::_get_next_item(Item *p_item, bool p_free) co
 		} else if (p_item->E->next()) {
 			return p_item->E->next()->get();
 		} else {
-			//go up until something with a next is found
+			// Go up until something with a next is found.
 			while (p_item->type != ITEM_FRAME && !p_item->E->next()) {
 				p_item = p_item->parent;
 			}
@@ -84,8 +84,6 @@ RichTextLabel::Item *RichTextLabel::_get_next_item(Item *p_item, bool p_free) co
 			}
 		}
 	}
-
-	return nullptr;
 }
 
 RichTextLabel::Item *RichTextLabel::_get_prev_item(Item *p_item, bool p_free) const {
@@ -97,7 +95,7 @@ RichTextLabel::Item *RichTextLabel::_get_prev_item(Item *p_item, bool p_free) co
 		} else if (p_item->E->prev()) {
 			return p_item->E->prev()->get();
 		} else {
-			//go back until something with a prev is found
+			// Go back until something with a prev is found.
 			while (p_item->parent && !p_item->E->prev()) {
 				p_item = p_item->parent;
 			}
@@ -117,7 +115,7 @@ RichTextLabel::Item *RichTextLabel::_get_prev_item(Item *p_item, bool p_free) co
 		} else if (p_item->E->prev()) {
 			return p_item->E->prev()->get();
 		} else {
-			//go back until something with a prev is found
+			// Go back until something with a prev is found.
 			while (p_item->type != ITEM_FRAME && !p_item->E->prev()) {
 				p_item = p_item->parent;
 			}
@@ -129,8 +127,6 @@ RichTextLabel::Item *RichTextLabel::_get_prev_item(Item *p_item, bool p_free) co
 			}
 		}
 	}
-
-	return nullptr;
 }
 
 Rect2 RichTextLabel::_get_text_rect() {