Commit 52be6f0e authored by Alexandre Julliard's avatar Alexandre Julliard

user32: Rename rectWindow to window_rect for consistency.

parent 0a75a1b6
...@@ -856,7 +856,7 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind ...@@ -856,7 +856,7 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind
} }
if (win != WND_OTHER_PROCESS) if (win != WND_OTHER_PROCESS)
{ {
RECT window_rect = win->rectWindow, client_rect = win->client_rect; RECT window_rect = win->window_rect, client_rect = win->client_rect;
switch (relative) switch (relative)
{ {
...@@ -867,10 +867,10 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind ...@@ -867,10 +867,10 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind
mirror_rect( &win->client_rect, &window_rect ); mirror_rect( &win->client_rect, &window_rect );
break; break;
case COORDS_WINDOW: case COORDS_WINDOW:
OffsetRect( &window_rect, -win->rectWindow.left, -win->rectWindow.top ); OffsetRect( &window_rect, -win->window_rect.left, -win->window_rect.top );
OffsetRect( &client_rect, -win->rectWindow.left, -win->rectWindow.top ); OffsetRect( &client_rect, -win->window_rect.left, -win->window_rect.top );
if (win->dwExStyle & WS_EX_LAYOUTRTL) if (win->dwExStyle & WS_EX_LAYOUTRTL)
mirror_rect( &win->rectWindow, &client_rect ); mirror_rect( &win->window_rect, &client_rect );
break; break;
case COORDS_PARENT: case COORDS_PARENT:
if (win->parent) if (win->parent)
......
...@@ -44,7 +44,7 @@ typedef struct tagWND ...@@ -44,7 +44,7 @@ typedef struct tagWND
DWORD tid; /* Owner thread id */ DWORD tid; /* Owner thread id */
HINSTANCE hInstance; /* Window hInstance (from CreateWindow) */ HINSTANCE hInstance; /* Window hInstance (from CreateWindow) */
RECT client_rect; /* Client area rel. to parent client area */ RECT client_rect; /* Client area rel. to parent client area */
RECT rectWindow; /* Whole window rel. to parent client area */ RECT window_rect; /* Whole window rel. to parent client area */
RECT visible_rect; /* Visible part of the whole rect, rel. to parent client area */ RECT visible_rect; /* Visible part of the whole rect, rel. to parent client area */
RECT normal_rect; /* Normal window rect saved when maximized/minimized */ RECT normal_rect; /* Normal window rect saved when maximized/minimized */
POINT min_pos; /* Position for minimized window */ POINT min_pos; /* Position for minimized window */
......
...@@ -704,7 +704,7 @@ static void WINPOS_ShowIconTitle( HWND hwnd, BOOL bShow ) ...@@ -704,7 +704,7 @@ static void WINPOS_ShowIconTitle( HWND hwnd, BOOL bShow )
TRACE("%p %i\n", hwnd, (bShow != 0) ); TRACE("%p %i\n", hwnd, (bShow != 0) );
if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) return; if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) return;
if (win->rectWindow.left == -32000 || win->rectWindow.top == -32000) if (win->window_rect.left == -32000 || win->window_rect.top == -32000)
{ {
TRACE( "not showing title for hidden icon %p\n", hwnd ); TRACE( "not showing title for hidden icon %p\n", hwnd );
bShow = FALSE; bShow = FALSE;
...@@ -1318,17 +1318,17 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) ...@@ -1318,17 +1318,17 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl )
/* update the placement according to the current style */ /* update the placement according to the current style */
if (pWnd->dwStyle & WS_MINIMIZE) if (pWnd->dwStyle & WS_MINIMIZE)
{ {
pWnd->min_pos.x = pWnd->rectWindow.left; pWnd->min_pos.x = pWnd->window_rect.left;
pWnd->min_pos.y = pWnd->rectWindow.top; pWnd->min_pos.y = pWnd->window_rect.top;
} }
else if (pWnd->dwStyle & WS_MAXIMIZE) else if (pWnd->dwStyle & WS_MAXIMIZE)
{ {
pWnd->max_pos.x = pWnd->rectWindow.left; pWnd->max_pos.x = pWnd->window_rect.left;
pWnd->max_pos.y = pWnd->rectWindow.top; pWnd->max_pos.y = pWnd->window_rect.top;
} }
else else
{ {
pWnd->normal_rect = pWnd->rectWindow; pWnd->normal_rect = pWnd->window_rect;
} }
wndpl->length = sizeof(*wndpl); wndpl->length = sizeof(*wndpl);
...@@ -2117,7 +2117,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, ...@@ -2117,7 +2117,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags,
{ {
win->dwStyle = reply->new_style; win->dwStyle = reply->new_style;
win->dwExStyle = reply->new_ex_style; win->dwExStyle = reply->new_ex_style;
win->rectWindow = *window_rect; win->window_rect = *window_rect;
win->client_rect = *client_rect; win->client_rect = *client_rect;
win->visible_rect = visible_rect; win->visible_rect = visible_rect;
win->surface = new_surface; win->surface = new_surface;
...@@ -2127,7 +2127,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, ...@@ -2127,7 +2127,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags,
{ {
RECT client; RECT client;
GetClientRect( win->parent, &client ); GetClientRect( win->parent, &client );
mirror_rect( &client, &win->rectWindow ); mirror_rect( &client, &win->window_rect );
mirror_rect( &client, &win->client_rect ); mirror_rect( &client, &win->client_rect );
mirror_rect( &client, &win->visible_rect ); mirror_rect( &client, &win->visible_rect );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment