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

[macOS] Avoid color flash on window creation and resizing.

Browse Source
This commit is contained in:
bruvzg 2023-01-13 00:02:07 +02:00
parent 7c2768c2f8
commit 1ed4ed3a16
No known key found for this signature in database
GPG Key ID: 7960FCF39844EC38
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
platform/macos/display_server_macos.mm
View File

@ -166,6 +166,17 @@ DisplayServerMacOS::WindowID DisplayServerMacOS::_create_window(WindowMode p_mod
layer.contentsScale = scale; layer.contentsScale = scale;
} }
NSColor *bg_color = [NSColor windowBackgroundColor];
Color _bg_color;
if (_get_window_early_clear_override(_bg_color)) {
bg_color = [NSColor colorWithCalibratedRed:_bg_color.r green:_bg_color.g blue:_bg_color.b alpha:1.f];
}
[wd.window_object setBackgroundColor:bg_color];
if (layer) {
[layer setBackgroundColor:bg_color.CGColor];
}
#if defined(VULKAN_ENABLED) #if defined(VULKAN_ENABLED)
if (context_vulkan) { if (context_vulkan) {
Error err = context_vulkan->window_create(window_id_counter, p_vsync_mode, wd.window_view, p_rect.size.width, p_rect.size.height); Error err = context_vulkan->window_create(window_id_counter, p_vsync_mode, wd.window_view, p_rect.size.width, p_rect.size.height);
@ -273,12 +284,17 @@ void DisplayServerMacOS::_set_window_per_pixel_transparency_enabled(bool p_enabl
#endif #endif
wd.layered_window = true; wd.layered_window = true;
} else { } else {
[wd.window_object setBackgroundColor:[NSColor colorWithCalibratedWhite:1 alpha:1]]; NSColor *bg_color = [NSColor windowBackgroundColor];
Color _bg_color;
if (_get_window_early_clear_override(_bg_color)) {
bg_color = [NSColor colorWithCalibratedRed:_bg_color.r green:_bg_color.g blue:_bg_color.b alpha:1.f];
}
[wd.window_object setBackgroundColor:bg_color];
[wd.window_object setOpaque:YES]; [wd.window_object setOpaque:YES];
[wd.window_object setHasShadow:YES]; [wd.window_object setHasShadow:YES];
CALayer *layer = [(NSView *)wd.window_view layer]; CALayer *layer = [(NSView *)wd.window_view layer];
if (layer) { if (layer) {
[layer setBackgroundColor:[NSColor colorWithCalibratedWhite:1 alpha:1].CGColor]; [layer setBackgroundColor:bg_color.CGColor];
[layer setOpaque:YES]; [layer setOpaque:YES];
} }
#if defined(GLES3_ENABLED) #if defined(GLES3_ENABLED)