3 files changed, 33 insertions, 0 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index 6bfad24b65..65a72267b1 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -2701,6 +2701,27 @@ bool Viewport::_sub_windows_forward_input(const Ref<InputEvent> &p_event) {
 			if (gui.subwindow_drag == SUB_WINDOW_DRAG_MOVE) {
 				Vector2 diff = mm->get_position() - gui.subwindow_drag_from;
 				Rect2i new_rect(gui.subwindow_drag_pos + diff, gui.subwindow_focused->get_size());
+
+				if (gui.subwindow_focused->is_clamped_to_embedder()) {
+					Size2i limit = get_visible_rect().size;
+					if (new_rect.position.x + new_rect.size.x > limit.x) {
+						new_rect.position.x = limit.x - new_rect.size.x;
+					}
+					if (new_rect.position.y + new_rect.size.y > limit.y) {
+						new_rect.position.y = limit.y - new_rect.size.y;
+					}
+
+					if (new_rect.position.x < 0) {
+						new_rect.position.x = 0;
+					}
+
+					int title_height = gui.subwindow_focused->get_flag(Window::FLAG_BORDERLESS) ? 0 : gui.subwindow_focused->get_theme_constant("title_height");
+
+					if (new_rect.position.y < title_height) {
+						new_rect.position.y = title_height;
+					}
+				}
+
 				gui.subwindow_focused->_rect_changed_callback(new_rect);
 			}
 			if (gui.subwindow_drag == SUB_WINDOW_DRAG_CLOSE) {
diff --git a/scene/main/window.cpp b/scene/main/window.cpp
index 8604bb78ac..0463615d4d 100644
--- a/scene/main/window.cpp
+++ b/scene/main/window.cpp
@@ -1251,6 +1251,14 @@ Rect2i Window::get_parent_rect() const {
 	}
 }
 
+void Window::set_clamp_to_embedder(bool p_enable) {
+	clamp_to_embedder = p_enable;
+}
+
+bool Window::is_clamped_to_embedder() const {
+	return clamp_to_embedder;
+}
+
 void Window::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_title", "title"), &Window::set_title);
 	ClassDB::bind_method(D_METHOD("get_title"), &Window::get_title);
diff --git a/scene/main/window.h b/scene/main/window.h
index 4855924660..5fd59e06f5 100644
--- a/scene/main/window.h
+++ b/scene/main/window.h
@@ -92,6 +92,7 @@ private:
 	bool exclusive = false;
 	bool wrap_controls = false;
 	bool updating_child_controls = false;
+	bool clamp_to_embedder = false;
 
 	void _update_child_controls();
 
@@ -195,6 +196,9 @@ public:
 	void set_exclusive(bool p_exclusive);
 	bool is_exclusive() const;
 
+	void set_clamp_to_embedder(bool p_enable);
+	bool is_clamped_to_embedder() const;
+
 	bool can_draw() const;
 
 	void set_ime_active(bool p_active);