seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[macOS] Fix transparent window state detection for embedded process.

Browse Source
This commit is contained in:
Pāvels Nadtočajevs
2025-05-13 17:09:51 +03:00
parent af62a09b42
commit 887fa78fc1
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/macos/display_server_embedded.h
View File

@ -66,6 +66,8 @@ class DisplayServerEmbedded : public DisplayServer {
WindowID window_id_counter = MAIN_WINDOW_ID; WindowID window_id_counter = MAIN_WINDOW_ID;
bool transparent = false;
CAContext *ca_context = nullptr; CAContext *ca_context = nullptr;
// Either be a CAMetalLayer or a CALayer depending on the rendering driver. // Either be a CAMetalLayer or a CALayer depending on the rendering driver.
CALayer *layer = nullptr; CALayer *layer = nullptr;

11
platform/macos/display_server_embedded.mm
View File

@ -192,7 +192,8 @@ DisplayServerEmbedded::DisplayServerEmbedded(const String &p_rendering_driver, W
layer.contentsScale = scale; layer.contentsScale = scale;
layer.magnificationFilter = kCAFilterNearest; layer.magnificationFilter = kCAFilterNearest;
layer.minificationFilter = kCAFilterNearest; layer.minificationFilter = kCAFilterNearest;
layer.opaque = NO; // Never opaque when embedded, clear color is drawn by control under the view. transparent = ((p_flags & WINDOW_FLAG_TRANSPARENT_BIT) == WINDOW_FLAG_TRANSPARENT_BIT);
layer.opaque = !(OS::get_singleton()->is_layered_allowed() && transparent);
layer.actions = @{ @"contents" : [NSNull null] }; // Disable implicit animations for contents. layer.actions = @{ @"contents" : [NSNull null] }; // Disable implicit animations for contents.
// AppKit frames, bounds and positions are always in points. // AppKit frames, bounds and positions are always in points.
CGRect bounds = CGRectMake(0, 0, p_resolution.width, p_resolution.height); CGRect bounds = CGRectMake(0, 0, p_resolution.width, p_resolution.height);
@ -654,10 +655,16 @@ bool DisplayServerEmbedded::window_is_maximize_allowed(WindowID p_window) const
} }
void DisplayServerEmbedded::window_set_flag(WindowFlags p_flag, bool p_enabled, WindowID p_window) { void DisplayServerEmbedded::window_set_flag(WindowFlags p_flag, bool p_enabled, WindowID p_window) {
// Not supported if (p_flag == WINDOW_FLAG_TRANSPARENT && p_window == MAIN_WINDOW_ID) {
transparent = p_enabled;
layer.opaque = !(OS::get_singleton()->is_layered_allowed() && transparent);
}
} }
bool DisplayServerEmbedded::window_get_flag(WindowFlags p_flag, WindowID p_window) const { bool DisplayServerEmbedded::window_get_flag(WindowFlags p_flag, WindowID p_window) const {
if (p_flag == WINDOW_FLAG_TRANSPARENT && p_window == MAIN_WINDOW_ID) {
return transparent;
}
return false; return false;
} }