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

[windows] Added early return for when toggling borderless while fullscreen

Browse Source
This commit is contained in:
Lukas Stark
2025-11-01 22:55:41 +01:00
parent 0fdbf050e0
commit 0a679a0a7f
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/windows/display_server_windows.cpp
View File

@ -2623,6 +2623,9 @@ void DisplayServerWindows::window_set_flag(WindowFlags p_flag, bool p_enabled, W
} break; } break;
case WINDOW_FLAG_BORDERLESS: { case WINDOW_FLAG_BORDERLESS: {
wd.borderless = p_enabled; wd.borderless = p_enabled;
if (wd.fullscreen) {
return;
}
_update_window_mouse_passthrough(p_window); _update_window_mouse_passthrough(p_window);
_update_window_style(p_window); _update_window_style(p_window);
ShowWindow(wd.hWnd, (wd.no_focus || wd.is_popup) ? SW_SHOWNOACTIVATE : SW_SHOW); // Show the window. ShowWindow(wd.hWnd, (wd.no_focus || wd.is_popup) ? SW_SHOWNOACTIVATE : SW_SHOW); // Show the window.