8 files changed, 38 insertions, 4 deletions

diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
index e1f55bd8a8..133aa39cd3 100644
--- a/editor/filesystem_dock.cpp
+++ b/editor/filesystem_dock.cpp
@@ -2313,7 +2313,7 @@ void FileSystemDock::_tree_rmb_select(const Vector2 &p_pos) {
 		tree_popup->clear();
 		tree_popup->set_size(Size2(1, 1));
 		_file_and_folders_fill_popup(tree_popup, paths);
-		tree_popup->set_position(tree->get_global_position() + p_pos);
+		tree_popup->set_position(tree->get_screen_position() + p_pos);
 		tree_popup->popup();
 	}
 }
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
index 9831f1bd31..b8ac405f53 100644
--- a/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -2399,7 +2399,7 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
 		}
 
 		menu->set_size(Size2(1, 1));
-		menu->set_position(p_menu_pos);
+		menu->set_position(get_screen_position() + p_menu_pos);
 		menu->popup();
 		return;
 	}
diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp
index 1b818036e1..6f29633188 100644
--- a/editor/scene_tree_editor.cpp
+++ b/editor/scene_tree_editor.cpp
@@ -1072,7 +1072,7 @@ void SceneTreeEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data,
 }
 
 void SceneTreeEditor::_rmb_select(const Vector2 &p_pos) {
-	emit_signal("rmb_pressed", tree->get_global_transform().xform(p_pos));
+	emit_signal("rmb_pressed", tree->get_screen_transform().xform(p_pos));
 }
 
 void SceneTreeEditor::_warning_changed(Node *p_for_node) {
diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp
index bacc65c7bf..faef979090 100644
--- a/scene/gui/dialogs.cpp
+++ b/scene/gui/dialogs.cpp
@@ -298,6 +298,7 @@ AcceptDialog::AcceptDialog() {
 	set_visible(false);
 	set_transient(true);
 	set_exclusive(true);
+	set_clamp_to_embedder(true);
 
 	bg = memnew(Panel);
 	add_child(bg);
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
index 251f31ce4e..27c2c70708 100644
--- a/scene/gui/line_edit.cpp
+++ b/scene/gui/line_edit.cpp
@@ -51,7 +51,7 @@ void LineEdit::_gui_input(Ref<InputEvent> p_event) {
 
 	if (b.is_valid()) {
 		if (b->is_pressed() && b->get_button_index() == BUTTON_RIGHT && context_menu_enabled) {
-			menu->set_position(get_global_transform().xform(get_local_mouse_position()));
+			menu->set_position(get_screen_transform().xform(get_local_mouse_position()));
 			menu->set_size(Vector2(1, 1));
 			//menu->set_scale(get_global_transform().get_scale());
 			menu->popup();
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index 0d5d222f5e..f272cfb7ca 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -2685,6 +2685,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 89c94753da..8191fc7219 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();
 
@@ -196,6 +197,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);