Improve ViewportTexture::get_size

Author: beicause

scene/main/viewport.cpp

@@ -134,33 +134,23 @@ int ViewportTexture::get_width() const {
 		_err_print_viewport_not_set();
 		return 0;
 	}
-	if (vp->is_sub_viewport()) {
-		return vp->size.width;
-	}
-	return vp->size.width * vp->get_stretch_transform().get_scale().width;
+	return vp->size.width;
 }
 
 int ViewportTexture::get_height() const {
 	if (!vp) {
 		_err_print_viewport_not_set();
 		return 0;
 	}
-	if (vp->is_sub_viewport()) {
-		return vp->size.height;
-	}
-	return vp->size.height * vp->get_stretch_transform().get_scale().height;
+	return vp->size.height;
 }
 
 Size2 ViewportTexture::get_size() const {
 	if (!vp) {
 		_err_print_viewport_not_set();
 		return Size2();
 	}
-	if (vp->is_sub_viewport()) {
-		return vp->size;
-	}
-	Size2 scale = vp->get_stretch_transform().get_scale();
-	return Size2(vp->size.width * scale.width, vp->size.height * scale.height).ceil();
+	return vp->size;
 }
 
 RID ViewportTexture::get_rid() const {
@@ -337,7 +327,7 @@ void Viewport::_sub_window_update(Window *p_window) {
 	sw.pending_window_update = false;
 
 	RS::get_singleton()->canvas_item_clear(sw.canvas_item);
-	const Rect2i r = Rect2i(p_window->get_position(), p_window->get_size());
+	const Rect2i r = Rect2i(p_window->get_position(), p_window->_get_size_2d_override());
 
 	if (!p_window->get_flag(Window::FLAG_BORDERLESS)) {
 		Ref<StyleBox> panel = gui.subwindow_focused == p_window ? p_window->theme_cache.embedded_border : p_window->theme_cache.embedded_unfocused_border;
@@ -372,7 +362,7 @@ void Viewport::_sub_window_update(Window *p_window) {
 		close_icon->draw(sw.canvas_item, r.position + Vector2(r.size.width - close_h_ofs, -close_v_ofs));
 	}
 
-	const Transform2D xform = sw.window->window_transform * sw.window->stretch_transform;
+	const Transform2D xform = sw.window->window_transform;
 	Rect2 vr = xform.xform(sw.window->get_visible_rect());
 	vr.position += p_window->get_position();
 	if (vr != r) {

scene/main/window.cpp

@@ -1306,6 +1306,11 @@ void Window::_update_viewport_size() {
 		}
 	}
 
+	if (embedder) {
+		Size2 scale = embedder->stretch_transform.get_scale();
+		final_size = Size2(final_size * scale).ceil();
+	}
+
 	bool allocate = is_inside_tree() && visible && (window_id != DisplayServer::INVALID_WINDOW_ID || embedder != nullptr);
 	_set_size(final_size, final_size_override, allocate);
 
@@ -1318,11 +1323,6 @@ void Window::_update_viewport_size() {
 	notification(NOTIFICATION_WM_SIZE_CHANGED);
 
 	if (embedder) {
-		float scale = MIN(embedder->stretch_transform.get_scale().width, embedder->stretch_transform.get_scale().height);
-		Viewport::set_oversampling_override(scale);
-		Size2 s = Size2(final_size.width * scale, final_size.height * scale).ceil();
-		RS::get_singleton()->viewport_set_global_canvas_transform(get_viewport_rid(), global_canvas_transform * scale * content_scale_factor);
-		RS::get_singleton()->viewport_set_size(get_viewport_rid(), s.width, s.height);
 		embedder->_sub_window_update(this);
 	}
 }