Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Windows] Fix borderless maximized window mode.

Browse source
This commit is contained in:
Pāvels Nadtočajevs 2025-03-27 10:19:07 +02:00
parent 594d64ec24
commit e00b7dc72d
No known key found for this signature in database
GPG key ID: 8413210218EF35D2
1 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

29
platform/windows/display_server_windows.cpp
View file

@ -2395,7 +2395,12 @@ void DisplayServerWindows::window_set_mode(WindowMode p_mode, WindowID p_window)
wd.was_fullscreen_pre_min = false;
if (p_mode == WINDOW_MODE_MAXIMIZED && wd.borderless) {
p_mode = WINDOW_MODE_FULLSCREEN;
int cs = window_get_current_screen(p_window);
Rect2i full = Rect2i(screen_get_position(cs), screen_get_size(cs));
Rect2i usable = screen_get_usable_rect(cs);
if (full == usable) {
p_mode = WINDOW_MODE_FULLSCREEN;
}
}
if (wd.fullscreen && p_mode != WINDOW_MODE_FULLSCREEN && p_mode != WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
@ -2434,12 +2439,24 @@ void DisplayServerWindows::window_set_mode(WindowMode p_mode, WindowID p_window)
wd.minimized = false;
}
if (p_mode == WINDOW_MODE_MAXIMIZED) {
if (p_mode == WINDOW_MODE_MAXIMIZED && !wd.borderless) {
ShowWindow(wd.hWnd, SW_MAXIMIZE);
wd.maximized = true;
wd.minimized = false;
}
if (p_mode == WINDOW_MODE_MAXIMIZED && wd.borderless) {
ShowWindow(wd.hWnd, SW_NORMAL);
wd.maximized = true;
wd.minimized = false;
int cs = window_get_current_screen(p_window);
Rect2i usable = screen_get_usable_rect(cs);
Point2 pos = usable.position + _get_screens_origin();
Size2 size = usable.size;
MoveWindow(wd.hWnd, pos.x, pos.y, size.width, size.height, TRUE);
}
if (p_mode == WINDOW_MODE_MINIMIZED) {
ShowWindow(wd.hWnd, SW_MINIMIZE);
wd.maximized = false;
@ -5599,6 +5616,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
int screen_id = window_get_current_screen(window_id);
Size2i screen_size = screen_get_size(screen_id);
Point2i screen_position = screen_get_position(screen_id);
Rect2i usable = screen_get_usable_rect(screen_id);
window.maximized = false;
window.minimized = false;
@ -5615,8 +5633,15 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
window.maximized_fs = true;
_update_window_style(window_id, false);
}
if (window.borderless && (screen_size != usable.size || screen_position != usable.position)) {
Point2 pos = usable.position + _get_screens_origin();
Size2 size = usable.size;
MoveWindow(window.hWnd, pos.x, pos.y, size.width, size.height, TRUE);
}
} else if (window_rect.position == screen_position && window_rect.size == screen_size) {
window.fullscreen = true;
} else if (window.borderless && usable.position == window_rect.position && usable.size == window_rect.size) {
window.maximized = true;
}
if (window.maximized_fs && !window.maximized) {