1 files changed, 49 insertions, 56 deletions

diff --git a/scene/main/window.cpp b/scene/main/window.cpp
index 3a8f7ebb60..a9be8a1eff 100644
--- a/scene/main/window.cpp
+++ b/scene/main/window.cpp
@@ -43,20 +43,22 @@ void Window::set_title(const String &p_title) {
 		embedder->_sub_window_update(this);
 
 	} else if (window_id != DisplayServer::INVALID_WINDOW_ID) {
-
 		DisplayServer::get_singleton()->window_set_title(p_title, window_id);
 	}
 }
+
 String Window::get_title() const {
 	return title;
 }
 
 void Window::set_current_screen(int p_screen) {
 	current_screen = p_screen;
-	if (window_id == DisplayServer::INVALID_WINDOW_ID)
+	if (window_id == DisplayServer::INVALID_WINDOW_ID) {
 		return;
+	}
 	DisplayServer::get_singleton()->window_set_current_screen(p_screen, window_id);
 }
+
 int Window::get_current_screen() const {
 	if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		current_screen = DisplayServer::get_singleton()->window_get_current_screen(window_id);
@@ -65,17 +67,16 @@ int Window::get_current_screen() const {
 }
 
 void Window::set_position(const Point2i &p_position) {
-
 	position = p_position;
 
 	if (embedder) {
 		embedder->_sub_window_update(this);
 
 	} else if (window_id != DisplayServer::INVALID_WINDOW_ID) {
-
 		DisplayServer::get_singleton()->window_set_position(p_position, window_id);
 	}
 }
+
 Point2i Window::get_position() const {
 	return position;
 }
@@ -84,13 +85,12 @@ void Window::set_size(const Size2i &p_size) {
 	size = p_size;
 	_update_window_size();
 }
-Size2i Window::get_size() const {
 
+Size2i Window::get_size() const {
 	return size;
 }
 
 Size2i Window::get_real_size() const {
-
 	if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		return DisplayServer::get_singleton()->window_get_real_size(window_id);
 	}
@@ -128,20 +128,17 @@ Size2i Window::get_min_size() const {
 }
 
 void Window::set_mode(Mode p_mode) {
-
 	mode = p_mode;
 
 	if (embedder) {
 		embedder->_sub_window_update(this);
 
 	} else if (window_id != DisplayServer::INVALID_WINDOW_ID) {
-
 		DisplayServer::get_singleton()->window_set_mode(DisplayServer::WindowMode(p_mode), window_id);
 	}
 }
 
 Window::Mode Window::get_mode() const {
-
 	if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		mode = (Mode)DisplayServer::get_singleton()->window_get_mode(window_id);
 	}
@@ -156,7 +153,6 @@ void Window::set_flag(Flags p_flag, bool p_enabled) {
 		embedder->_sub_window_update(this);
 
 	} else if (window_id != DisplayServer::INVALID_WINDOW_ID) {
-
 		DisplayServer::get_singleton()->window_set_flag(DisplayServer::WindowFlags(p_flag), p_enabled, window_id);
 	}
 }
@@ -181,8 +177,8 @@ void Window::request_attention() {
 		DisplayServer::get_singleton()->window_request_attention(window_id);
 	}
 }
-void Window::move_to_foreground() {
 
+void Window::move_to_foreground() {
 	if (embedder) {
 		embedder->_sub_window_grab_focus(this);
 
@@ -207,6 +203,7 @@ void Window::set_ime_active(bool p_active) {
 		DisplayServer::get_singleton()->window_set_ime_active(p_active, window_id);
 	}
 }
+
 void Window::set_ime_position(const Point2i &p_pos) {
 	if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		DisplayServer::get_singleton()->window_set_ime_position(p_pos, window_id);
@@ -251,8 +248,8 @@ void Window::_make_window() {
 
 	RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RS::VIEWPORT_UPDATE_WHEN_VISIBLE);
 }
-void Window::_update_from_window() {
 
+void Window::_update_from_window() {
 	ERR_FAIL_COND(window_id == DisplayServer::INVALID_WINDOW_ID);
 	mode = (Mode)DisplayServer::get_singleton()->window_get_mode(window_id);
 	for (int i = 0; i < FLAG_MAX; i++) {
@@ -283,7 +280,6 @@ void Window::_clear_window() {
 }
 
 void Window::_rect_changed_callback(const Rect2i &p_callback) {
-
 	//we must always accept this as the truth
 	if (size == p_callback.size && position == p_callback.position) {
 		return;
@@ -309,7 +305,6 @@ void Window::_propagate_window_notification(Node *p_node, int p_notification) {
 }
 
 void Window::_event_callback(DisplayServer::WindowEvent p_event) {
-
 	switch (p_event) {
 		case DisplayServer::WINDOW_EVENT_MOUSE_ENTER: {
 			_propagate_window_notification(this, NOTIFICATION_WM_MOUSE_ENTER);
@@ -351,12 +346,12 @@ void Window::_event_callback(DisplayServer::WindowEvent p_event) {
 void Window::show() {
 	set_visible(true);
 }
+
 void Window::hide() {
 	set_visible(false);
 }
 
 void Window::set_visible(bool p_visible) {
-
 	if (visible == p_visible) {
 		return;
 	}
@@ -473,12 +468,12 @@ void Window::set_transient(bool p_transient) {
 		_clear_transient();
 	}
 }
+
 bool Window::is_transient() const {
 	return transient;
 }
 
 void Window::set_exclusive(bool p_exclusive) {
-
 	if (exclusive == p_exclusive) {
 		return;
 	}
@@ -506,7 +501,6 @@ bool Window::is_visible() const {
 }
 
 void Window::_update_window_size() {
-
 	Size2i size_limit;
 	if (wrap_controls) {
 		size_limit = get_contents_minimum_size();
@@ -535,6 +529,7 @@ void Window::_update_window_size() {
 	//update the viewport
 	_update_viewport_size();
 }
+
 void Window::_update_viewport_size() {
 	//update the viewport part
 
@@ -545,12 +540,10 @@ void Window::_update_viewport_size() {
 	float font_oversampling = 1.0;
 
 	if (content_scale_mode == CONTENT_SCALE_MODE_DISABLED || content_scale_size.x == 0 || content_scale_size.y == 0) {
-
 		stretch_transform = Transform2D();
 		final_size = size;
 
 	} else {
-
 		//actual screen video mode
 		Size2 video_mode = size;
 		Size2 desired_res = content_scale_size;
@@ -569,7 +562,6 @@ void Window::_update_viewport_size() {
 			// screen ratio is smaller vertically
 
 			if (content_scale_aspect == CONTENT_SCALE_ASPECT_KEEP_HEIGHT || content_scale_aspect == CONTENT_SCALE_ASPECT_EXPAND) {
-
 				//will stretch horizontally
 				viewport_size.x = desired_res.y * video_mode_aspect;
 				viewport_size.y = desired_res.y;
@@ -584,7 +576,6 @@ void Window::_update_viewport_size() {
 		} else {
 			//screen ratio is smaller horizontally
 			if (content_scale_aspect == CONTENT_SCALE_ASPECT_KEEP_WIDTH || content_scale_aspect == CONTENT_SCALE_ASPECT_EXPAND) {
-
 				//will stretch horizontally
 				viewport_size.x = desired_res.x;
 				viewport_size.y = desired_res.x / video_mode_aspect;
@@ -622,14 +613,12 @@ void Window::_update_viewport_size() {
 				//_update_font_oversampling(1.0);
 			} break;
 			case CONTENT_SCALE_MODE_OBJECTS: {
-
 				final_size = screen_size;
 				final_size_override = viewport_size;
 				attach_to_screen_rect = Rect2(margin, screen_size);
 				font_oversampling = screen_size.x / viewport_size.x;
 			} break;
 			case CONTENT_SCALE_MODE_PIXELS: {
-
 				final_size = viewport_size;
 				attach_to_screen_rect = Rect2(margin, screen_size);
 
@@ -652,12 +641,10 @@ void Window::_update_viewport_size() {
 	}
 
 	if (window_id == DisplayServer::MAIN_WINDOW_ID) {
-
 		if (!use_font_oversampling) {
 			font_oversampling = 1.0;
 		}
 		if (DynamicFontAtSize::font_oversampling != font_oversampling) {
-
 			DynamicFontAtSize::font_oversampling = font_oversampling;
 			DynamicFont::update_oversampling();
 		}
@@ -679,11 +666,9 @@ void Window::_update_window_callbacks() {
 }
 
 Viewport *Window::_get_embedder() const {
-
 	Viewport *vp = get_parent_viewport();
 
 	while (vp) {
-
 		if (vp->is_embedding_subwindows()) {
 			return vp;
 		}
@@ -699,10 +684,8 @@ Viewport *Window::_get_embedder() const {
 
 void Window::_notification(int p_what) {
 	if (p_what == NOTIFICATION_ENTER_TREE) {
-
 		bool embedded = false;
 		{
-
 			embedder = _get_embedder();
 
 			if (embedder) {
@@ -757,29 +740,24 @@ void Window::_notification(int p_what) {
 	}
 
 	if (p_what == NOTIFICATION_READY) {
-
 		if (wrap_controls) {
 			_update_child_controls();
 		}
 	}
 
 	if (p_what == NOTIFICATION_EXIT_TREE) {
-
 		if (transient) {
 			_clear_transient();
 		}
 
 		if (!is_embedded() && window_id != DisplayServer::INVALID_WINDOW_ID) {
-
 			if (window_id == DisplayServer::MAIN_WINDOW_ID) {
-
 				RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RS::VIEWPORT_UPDATE_DISABLED);
 				_update_window_callbacks();
 			} else {
 				_clear_window();
 			}
 		} else {
-
 			if (embedder) {
 				embedder->_sub_window_remove(this);
 				embedder = nullptr;
@@ -807,6 +785,7 @@ void Window::set_content_scale_mode(ContentScaleMode p_mode) {
 	content_scale_mode = p_mode;
 	_update_viewport_size();
 }
+
 Window::ContentScaleMode Window::get_content_scale_mode() const {
 	return content_scale_mode;
 }
@@ -815,6 +794,7 @@ void Window::set_content_scale_aspect(ContentScaleAspect p_aspect) {
 	content_scale_aspect = p_aspect;
 	_update_viewport_size();
 }
+
 Window::ContentScaleAspect Window::get_content_scale_aspect() const {
 	return content_scale_aspect;
 }
@@ -826,6 +806,7 @@ void Window::set_use_font_oversampling(bool p_oversampling) {
 	use_font_oversampling = p_oversampling;
 	_update_viewport_size();
 }
+
 bool Window::is_using_font_oversampling() const {
 	return use_font_oversampling;
 }
@@ -861,8 +842,8 @@ Size2 Window::_get_contents_minimum_size() const {
 
 	return max;
 }
-void Window::_update_child_controls() {
 
+void Window::_update_child_controls() {
 	if (!updating_child_controls) {
 		return;
 	}
@@ -871,8 +852,8 @@ void Window::_update_child_controls() {
 
 	updating_child_controls = false;
 }
-void Window::child_controls_changed() {
 
+void Window::child_controls_changed() {
 	if (!is_inside_tree() || !visible || updating_child_controls) {
 		return;
 	}
@@ -882,8 +863,9 @@ void Window::child_controls_changed() {
 }
 
 void Window::_window_input(const Ref<InputEvent> &p_ev) {
-	if (Engine::get_singleton()->is_editor_hint() && (Object::cast_to<InputEventJoypadButton>(p_ev.ptr()) || Object::cast_to<InputEventJoypadMotion>(*p_ev)))
+	if (Engine::get_singleton()->is_editor_hint() && (Object::cast_to<InputEventJoypadButton>(p_ev.ptr()) || Object::cast_to<InputEventJoypadMotion>(*p_ev))) {
 		return; //avoid joy input on editor
+	}
 
 	if (EngineDebugger::is_active()) {
 		//quit from game window using F8
@@ -905,15 +887,16 @@ void Window::_window_input(const Ref<InputEvent> &p_ev) {
 		unhandled_input(p_ev);
 	}
 }
+
 void Window::_window_input_text(const String &p_text) {
 	input_text(p_text);
 }
+
 void Window::_window_drop_files(const Vector<String> &p_files) {
-	emit_signal("files_dropped", p_files);
+	emit_signal("files_dropped", p_files, current_screen);
 }
 
 Viewport *Window::get_parent_viewport() const {
-
 	if (get_parent()) {
 		return get_parent()->get_viewport();
 	} else {
@@ -922,7 +905,6 @@ Viewport *Window::get_parent_viewport() const {
 }
 
 Window *Window::get_parent_visible_window() const {
-
 	Viewport *vp = get_parent_viewport();
 	Window *window = nullptr;
 	while (vp) {
@@ -940,7 +922,6 @@ Window *Window::get_parent_visible_window() const {
 }
 
 void Window::popup_on_parent(const Rect2i &p_parent_rect) {
-
 	ERR_FAIL_COND(!is_inside_tree());
 	ERR_FAIL_COND_MSG(window_id == DisplayServer::MAIN_WINDOW_ID, "Can't popup the main window.");
 
@@ -958,7 +939,6 @@ void Window::popup_on_parent(const Rect2i &p_parent_rect) {
 }
 
 void Window::popup_centered_clamped(const Size2i &p_size, float p_fallback_ratio) {
-
 	ERR_FAIL_COND(!is_inside_tree());
 	ERR_FAIL_COND_MSG(window_id == DisplayServer::MAIN_WINDOW_ID, "Can't popup the main window.");
 
@@ -1009,11 +989,10 @@ void Window::popup_centered(const Size2i &p_minsize) {
 }
 
 void Window::popup_centered_ratio(float p_ratio) {
-
 	ERR_FAIL_COND(!is_inside_tree());
 	ERR_FAIL_COND_MSG(window_id == DisplayServer::MAIN_WINDOW_ID, "Can't popup the main window.");
 
-	Rect2i parent_rect;
+	Rect2 parent_rect;
 
 	if (is_embedded()) {
 		parent_rect = get_parent_viewport()->get_visible_rect();
@@ -1032,7 +1011,6 @@ void Window::popup_centered_ratio(float p_ratio) {
 }
 
 void Window::popup(const Rect2i &p_screen_rect) {
-
 	emit_signal("about_to_popup");
 
 	if (p_screen_rect != Rect2i()) {
@@ -1046,6 +1024,15 @@ void Window::popup(const Rect2i &p_screen_rect) {
 		set_size(adjust.size);
 	}
 
+	int scr = DisplayServer::get_singleton()->get_screen_count();
+	for (int i = 0; i < scr; i++) {
+		Rect2i r = DisplayServer::get_singleton()->screen_get_usable_rect(i);
+		if (r.has_point(position)) {
+			current_screen = i;
+			break;
+		}
+	}
+
 	set_transient(true);
 	set_visible(true);
 	_post_popup();
@@ -1074,7 +1061,6 @@ Rect2i Window::get_usable_parent_rect() const {
 	if (is_embedded()) {
 		parent = _get_embedder()->get_visible_rect();
 	} else {
-
 		const Window *w = is_visible() ? this : get_parent_visible_window();
 		//find a parent that can contain us
 		ERR_FAIL_COND_V(!w, Rect2());
@@ -1085,7 +1071,6 @@ Rect2i Window::get_usable_parent_rect() const {
 }
 
 void Window::add_child_notify(Node *p_child) {
-
 	Control *child_c = Object::cast_to<Control>(p_child);
 
 	if (child_c && child_c->data.theme.is_null() && (theme_owner || theme_owner_window)) {
@@ -1104,17 +1089,16 @@ void Window::add_child_notify(Node *p_child) {
 }
 
 void Window::remove_child_notify(Node *p_child) {
-
 	Control *child_c = Object::cast_to<Control>(p_child);
 
 	if (child_c && (child_c->data.theme_owner || child_c->data.theme_owner_window) && child_c->data.theme.is_null()) {
-		Control::_propagate_theme_changed(child_c, NULL, NULL);
+		Control::_propagate_theme_changed(child_c, nullptr, nullptr);
 	}
 
 	Window *child_w = Object::cast_to<Window>(p_child);
 
 	if (child_w && (child_w->theme_owner || child_w->theme_owner_window) && child_w->theme.is_null()) {
-		Control::_propagate_theme_changed(child_w, NULL, NULL);
+		Control::_propagate_theme_changed(child_w, nullptr, nullptr);
 	}
 
 	if (is_inside_tree() && wrap_controls) {
@@ -1123,19 +1107,17 @@ void Window::remove_child_notify(Node *p_child) {
 }
 
 void Window::set_theme(const Ref<Theme> &p_theme) {
-
-	if (theme == p_theme)
+	if (theme == p_theme) {
 		return;
+	}
 
 	theme = p_theme;
 
 	if (!p_theme.is_null()) {
-
 		theme_owner = nullptr;
 		theme_owner_window = this;
 		Control::_propagate_theme_changed(this, nullptr, this);
 	} else {
-
 		Control *parent_c = cast_to<Control>(get_parent());
 		if (parent_c && (parent_c->data.theme_owner || parent_c->data.theme_owner_window)) {
 			Control::_propagate_theme_changed(this, parent_c->data.theme_owner, parent_c->data.theme_owner_window);
@@ -1149,6 +1131,7 @@ void Window::set_theme(const Ref<Theme> &p_theme) {
 		}
 	}
 }
+
 Ref<Theme> Window::get_theme() const {
 	return theme;
 }
@@ -1157,22 +1140,27 @@ Ref<Texture2D> Window::get_theme_icon(const StringName &p_name, const StringName
 	StringName type = p_type ? p_type : get_class_name();
 	return Control::get_icons(theme_owner, theme_owner_window, p_name, type);
 }
+
 Ref<Shader> Window::get_theme_shader(const StringName &p_name, const StringName &p_type) const {
 	StringName type = p_type ? p_type : get_class_name();
 	return Control::get_shaders(theme_owner, theme_owner_window, p_name, type);
 }
+
 Ref<StyleBox> Window::get_theme_stylebox(const StringName &p_name, const StringName &p_type) const {
 	StringName type = p_type ? p_type : get_class_name();
 	return Control::get_styleboxs(theme_owner, theme_owner_window, p_name, type);
 }
+
 Ref<Font> Window::get_theme_font(const StringName &p_name, const StringName &p_type) const {
 	StringName type = p_type ? p_type : get_class_name();
 	return Control::get_fonts(theme_owner, theme_owner_window, p_name, type);
 }
+
 Color Window::get_theme_color(const StringName &p_name, const StringName &p_type) const {
 	StringName type = p_type ? p_type : get_class_name();
 	return Control::get_colors(theme_owner, theme_owner_window, p_name, type);
 }
+
 int Window::get_theme_constant(const StringName &p_name, const StringName &p_type) const {
 	StringName type = p_type ? p_type : get_class_name();
 	return Control::get_constants(theme_owner, theme_owner_window, p_name, type);
@@ -1182,22 +1170,27 @@ bool Window::has_theme_icon(const StringName &p_name, const StringName &p_type)
 	StringName type = p_type ? p_type : get_class_name();
 	return Control::has_icons(theme_owner, theme_owner_window, p_name, type);
 }
+
 bool Window::has_theme_shader(const StringName &p_name, const StringName &p_type) const {
 	StringName type = p_type ? p_type : get_class_name();
 	return Control::has_shaders(theme_owner, theme_owner_window, p_name, type);
 }
+
 bool Window::has_theme_stylebox(const StringName &p_name, const StringName &p_type) const {
 	StringName type = p_type ? p_type : get_class_name();
 	return Control::has_styleboxs(theme_owner, theme_owner_window, p_name, type);
 }
+
 bool Window::has_theme_font(const StringName &p_name, const StringName &p_type) const {
 	StringName type = p_type ? p_type : get_class_name();
 	return Control::has_fonts(theme_owner, theme_owner_window, p_name, type);
 }
+
 bool Window::has_theme_color(const StringName &p_name, const StringName &p_type) const {
 	StringName type = p_type ? p_type : get_class_name();
 	return Control::has_colors(theme_owner, theme_owner_window, p_name, type);
 }
+
 bool Window::has_theme_constant(const StringName &p_name, const StringName &p_type) const {
 	StringName type = p_type ? p_type : get_class_name();
 	return Control::has_constants(theme_owner, theme_owner_window, p_name, type);
@@ -1240,7 +1233,6 @@ Rect2i Window::get_parent_rect() const {
 }
 
 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);
 
@@ -1285,7 +1277,7 @@ void Window::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_exclusive", "exclusive"), &Window::set_exclusive);
 	ClassDB::bind_method(D_METHOD("is_exclusive"), &Window::is_exclusive);
 
-	ClassDB::bind_method(D_METHOD("can_draw"), &Window::is_transient);
+	ClassDB::bind_method(D_METHOD("can_draw"), &Window::can_draw);
 	ClassDB::bind_method(D_METHOD("has_focus"), &Window::has_focus);
 	ClassDB::bind_method(D_METHOD("grab_focus"), &Window::grab_focus);
 
@@ -1402,5 +1394,6 @@ Window::Window() {
 	content_scale_aspect = CONTENT_SCALE_ASPECT_IGNORE;
 	RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RS::VIEWPORT_UPDATE_DISABLED);
 }
+
 Window::~Window() {
 }