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

Don't force borderless mode when using per-pixel transparency

This commit is contained in:
Technohacker 2020-05-10 19:19:35 +05:30
parent 9584f24be5
commit 0456311be3
No known key found for this signature in database
GPG Key ID: 2AA912BBD7784F5C
3 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/osx/os_osx.mm
View File

@ -2661,7 +2661,6 @@ void OS_OSX::set_window_per_pixel_transparency_enabled(bool p_enabled) {
if (!is_layered_allowed()) return; if (!is_layered_allowed()) return;
if (layered_window != p_enabled) { if (layered_window != p_enabled) {
if (p_enabled) { if (p_enabled) {
set_borderless_window(true);
GLint opacity = 0; GLint opacity = 0;
[window_object setBackgroundColor:[NSColor clearColor]]; [window_object setBackgroundColor:[NSColor clearColor]];
[window_object setOpaque:NO]; [window_object setOpaque:NO];
@ -2691,9 +2690,6 @@ void OS_OSX::set_borderless_window(bool p_borderless) {
if (p_borderless) { if (p_borderless) {
[window_object setStyleMask:NSWindowStyleMaskBorderless]; [window_object setStyleMask:NSWindowStyleMaskBorderless];
} else { } else {
if (layered_window)
set_window_per_pixel_transparency_enabled(false);
[window_object setStyleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | (resizable ? NSWindowStyleMaskResizable : 0)]; [window_object setStyleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | (resizable ? NSWindowStyleMaskResizable : 0)];
// Force update of the window styles // Force update of the window styles

4
platform/windows/os_windows.cpp
View File

@ -2210,7 +2210,6 @@ void OS_Windows::set_window_per_pixel_transparency_enabled(bool p_enabled) {
if (!is_layered_allowed()) return; if (!is_layered_allowed()) return;
if (layered_window != p_enabled) { if (layered_window != p_enabled) {
if (p_enabled) { if (p_enabled) {
set_borderless_window(true);
//enable per-pixel alpha //enable per-pixel alpha
DWM_BLURBEHIND bb = { 0 }; DWM_BLURBEHIND bb = { 0 };
@ -2239,9 +2238,6 @@ void OS_Windows::set_borderless_window(bool p_borderless) {
if (video_mode.borderless_window == p_borderless) if (video_mode.borderless_window == p_borderless)
return; return;
if (!p_borderless && layered_window)
set_window_per_pixel_transparency_enabled(false);
video_mode.borderless_window = p_borderless; video_mode.borderless_window = p_borderless;
preserve_window_size = true; preserve_window_size = true;

4
platform/x11/os_x11.cpp
View File

@ -964,7 +964,6 @@ void OS_X11::set_window_per_pixel_transparency_enabled(bool p_enabled) {
if (!is_layered_allowed()) return; if (!is_layered_allowed()) return;
if (layered_window != p_enabled) { if (layered_window != p_enabled) {
if (p_enabled) { if (p_enabled) {
set_borderless_window(true);
layered_window = true; layered_window = true;
} else { } else {
layered_window = false; layered_window = false;
@ -1683,9 +1682,6 @@ void OS_X11::set_borderless_window(bool p_borderless) {
if (get_borderless_window() == p_borderless) if (get_borderless_window() == p_borderless)
return; return;
if (!p_borderless && layered_window)
set_window_per_pixel_transparency_enabled(false);
current_videomode.borderless_window = p_borderless; current_videomode.borderless_window = p_borderless;
Hints hints; Hints hints;