Skip to content

Fix Windows maximize geometry at high DPI #18254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nx111 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Windows maximize geometry at high DPI #18254

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions video/out/w32_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,11 @@ static void adjust_working_area_for_extended_frame(RECT *wa_rect, RECT *wnd_rect
RECT frame = {0};

if (DwmGetWindowAttribute(wnd, DWMWA_EXTENDED_FRAME_BOUNDS,
&frame, sizeof(RECT)) == S_OK) {
&frame, sizeof(RECT)) == S_OK &&
rect_w(frame) > 0 && rect_h(frame) > 0 &&
frame.left >= wnd_rect->left && frame.top >= wnd_rect->top &&
frame.right <= wnd_rect->right && frame.bottom <= wnd_rect->bottom)

@kasper93 kasper93 Jul 11, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this condition?

{
wa_rect->left -= frame.left - wnd_rect->left;
wa_rect->top -= frame.top - wnd_rect->top;
wa_rect->right += wnd_rect->right - frame.right;
Expand Down Expand Up @@ -1440,11 +1444,16 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam,
bool updated = (m_config_cache_write_opt(w32->opts_cache, &w32->opts->window_maximized) ||
m_config_cache_write_opt(w32->opts_cache, &w32->opts->window_minimized));
if (updated || w32->pending_resize) {
// We call window resize here, only to recalculate possible window
// size after changing the style, but we want to preserve the client
// size.
w32->window_state_changed = true;
window_resize(w32);
// Native maximize has already selected the work-area rectangle.
// Re-entering geometry calculation here can overwrite it with
// stale startup bounds, especially on a high-DPI display.
if (wParam != SIZE_MAXIMIZED) {

@kasper93 kasper93 Jul 11, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Won't it break the maximize state change in general, it won't trigger resize anymore, so title bar size will not be recalculated.

// We call window resize here, only to recalculate possible window
// size after changing the style, but we want to preserve the client
// size.
w32->window_state_changed = true;
window_resize(w32);
}
events |= VO_EVENT_WIN_STATE;
}

Expand Down Expand Up @@ -1476,6 +1485,9 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam,
case WM_DPICHANGED:
update_display_info(w32);

if (IsMaximized(w32->window) || w32->current_fs)
break;

RECT *rc = (RECT*)lParam;
w32->current_rect = *rc;
subtract_window_borders(w32, w32->window, &w32->current_rect);
Expand Down
Loading