marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11.drv: Fix X11DRV_X_to_window_rect to handle windows smaller than the decoration. 

A window can be resized to a smaller size than the decoration (title +
borders), such as when it is minimized. In such cases it is necessary
to recompute the minimum bounds, as it is done in the opposite function
X11DRV_window_to_X_rect, since the real information was lost.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48490
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Gabriel Ivăncescu 2020-05-19 15:18:48 +03:00 committed by Alexandre Julliard
parent df0d8ac5be
commit fff3642747
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/winex11.drv/window.c
View File

@ -1209,12 +1209,16 @@ static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect,
*/
void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect, int x, int y, int cx, int cy )
{
x += data->window_rect.left - data->whole_rect.left;
y += data->window_rect.top - data->whole_rect.top;
cx += (data->window_rect.right - data->window_rect.left) -
(data->whole_rect.right - data->whole_rect.left);
cy += (data->window_rect.bottom - data->window_rect.top) -
(data->whole_rect.bottom - data->whole_rect.top);
RECT rc;
get_decoration_rect( data, &rc, &data->window_rect, &data->client_rect );
x += min( data->window_rect.left - data->whole_rect.left, rc.left );
y += min( data->window_rect.top - data->whole_rect.top, rc.top );
cx += max( (data->window_rect.right - data->window_rect.left) -
(data->whole_rect.right - data->whole_rect.left), rc.right - rc.left );
cy += max( (data->window_rect.bottom - data->window_rect.top) -
(data->whole_rect.bottom - data->whole_rect.top), rc.bottom - rc.top );
SetRect( rect, x, y, x + cx, y + cy );
}