godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Draw checkerboard (or clear color) under embedded window.

Browse Source
This commit is contained in:
Pāvels Nadtočajevs
2025-05-13 09:08:10 +03:00
parent c0ebba60de
commit 6a118b5027
4 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
editor/plugins/embedded_process.cpp
View File

@@ -30,6 +30,7 @@
#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"
@@ -37,13 +38,19 @@
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,6 +103,7 @@ 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();
}
}
@@ -86,6 +111,7 @@ 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();
}
}

6
editor/plugins/embedded_process.h
View File

@@ -47,6 +47,12 @@ protected:
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);

3
main/main.cpp
View File

@@ -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

2
platform/macos/display_server_embedded.mm
View File

@@ -192,7 +192,7 @@ DisplayServerEmbedded::DisplayServerEmbedded(const String &p_rendering_driver, W
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);