Merge pull request #106340 from bruvzg/trasn_emb_bg

Draw checkerboard (or clear color) under embedded window.

Author: akien-mga

editor/plugins/embedded_process.cpp

@@ -30,20 +30,27 @@
 
 #include "embedded_process.h"
 
+#include "core/config/project_settings.h"
 #include "editor/editor_string_names.h"
 #include "scene/main/window.h"
 #include "scene/resources/style_box_flat.h"
 #include "scene/theme/theme_db.h"
 
 void EmbeddedProcessBase::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_READY: {
+			ProjectSettings::get_singleton()->connect("settings_changed", callable_mp(this, &EmbeddedProcessBase::_project_settings_changed));
+		} break;
 		case NOTIFICATION_ENTER_TREE: {
 			window = get_window();
+			transp_enabled = GLOBAL_GET("display/window/per_pixel_transparency/allowed");
+			clear_color = GLOBAL_GET("rendering/environment/defaults/default_clear_color");
 		} break;
 		case NOTIFICATION_DRAW: {
 			_draw();
 		} break;
 		case NOTIFICATION_THEME_CHANGED: {
+			checkerboard = get_editor_theme_icon(SNAME("Checkerboard"));
 			focus_style_box = get_theme_stylebox(SNAME("FocusViewport"), EditorStringName(EditorStyles));
 			Ref<StyleBoxFlat> focus_style_box_flat = focus_style_box;
 			if (focus_style_box_flat.is_valid()) {
@@ -60,6 +67,12 @@ void EmbeddedProcessBase::_notification(int p_what) {
 	}
 }
 
+void EmbeddedProcessBase::_project_settings_changed() {
+	transp_enabled = GLOBAL_GET("display/window/per_pixel_transparency/allowed");
+	clear_color = GLOBAL_GET("rendering/environment/defaults/default_clear_color");
+	queue_redraw();
+}
+
 void EmbeddedProcessBase::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("embedding_completed"));
 	ADD_SIGNAL(MethodInfo("embedding_failed"));
@@ -68,6 +81,17 @@ void EmbeddedProcessBase::_bind_methods() {
 }
 
 void EmbeddedProcessBase::_draw() {
+	if (is_embedding_completed()) {
+		Rect2 r = get_adjusted_embedded_window_rect(get_rect());
+#ifndef MACOS_ENABLED
+		r.position -= get_window()->get_position();
+#endif
+		if (transp_enabled) {
+			draw_texture_rect(checkerboard, r, true);
+		} else {
+			draw_rect(r, clear_color, true);
+		}
+	}
 	if (is_process_focused() && focus_style_box.is_valid()) {
 		Size2 size = get_size();
 		Rect2 r = Rect2(Point2(), size);
@@ -79,13 +103,15 @@ void EmbeddedProcessBase::set_window_size(const Size2i &p_window_size) {
 	if (window_size != p_window_size) {
 		window_size = p_window_size;
 		queue_update_embedded_process();
+		queue_redraw();
 	}
 }
 
 void EmbeddedProcessBase::set_keep_aspect(bool p_keep_aspect) {
 	if (keep_aspect != p_keep_aspect) {
 		keep_aspect = p_keep_aspect;
 		queue_update_embedded_process();
+		queue_redraw();
 	}
 }
 

editor/plugins/embedded_process.h

@@ -47,6 +47,12 @@ class EmbeddedProcessBase : public Control {
 	Point2i margin_bottom_right;
 	Window *window = nullptr;
 
+	bool transp_enabled = false;
+	Color clear_color;
+	Ref<Texture2D> checkerboard;
+
+	void _project_settings_changed();
+
 	static void _bind_methods();
 	void _notification(int p_what);
 

main/main.cpp

@@ -3132,6 +3132,9 @@ Error Main::setup2(bool p_show_boot_logo) {
 			// from --position and --resolution parameters.
 			window_mode = DisplayServer::WINDOW_MODE_WINDOWED;
 			window_flags = DisplayServer::WINDOW_FLAG_BORDERLESS_BIT;
+			if (bool(GLOBAL_GET("display/window/size/transparent"))) {
+				window_flags |= DisplayServer::WINDOW_FLAG_TRANSPARENT_BIT;
+			}
 		}
 
 #ifdef TOOLS_ENABLED

platform/macos/display_server_embedded.mm

@@ -192,7 +192,7 @@
 	layer.contentsScale = scale;
 	layer.magnificationFilter = kCAFilterNearest;
 	layer.minificationFilter = kCAFilterNearest;
-	layer.opaque = YES; // Always opaque when embedded.
+	layer.opaque = NO; // Never opaque when embedded, clear color is drawn by control under the view.
 	layer.actions = @{ @"contents" : [NSNull null] }; // Disable implicit animations for contents.
 	// AppKit frames, bounds and positions are always in points.
 	CGRect bounds = CGRectMake(0, 0, p_resolution.width, p_resolution.height);