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=48490Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winex11.drv: Fix X11DRV_X_to_window_rect to handle windows smaller than the decoration.
fff36427 · Gabriel Ivăncescu · Alexandre Julliard · df0d8ac5 · fff36427
Commit fff36427 authored May 19, 2020 by Gabriel Ivăncescu Committed by Alexandre Julliard May 20, 2020
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

window.c dlls/winex11.drv/window.c +10 -6

No files found.
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -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;
+    RECT rc;
-    y += data->window_rect.top - data->whole_rect.top;
-    cx += (data->window_rect.right - data->window_rect.left) -
+    get_decoration_rect( data, &rc, &data->window_rect, &data->client_rect );
-          (data->whole_rect.right - data->whole_rect.left);
-    cy += (data->window_rect.bottom - data->window_rect.top) -
+    x += min( data->window_rect.left - data->whole_rect.left, rc.left );
-          (data->whole_rect.bottom - data->whole_rect.top);
+    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 );
 }