Commit 36219644 authored by Chris Morgan's avatar Chris Morgan Committed by Alexandre Julliard

Fixed borders of windows while dragging or sizing to match

TWEAK_WineLook setting.
parent 76b772e6
...@@ -2204,7 +2204,9 @@ static void NC_DoSizeMove( HWND hwnd, WORD wParam ) ...@@ -2204,7 +2204,9 @@ static void NC_DoSizeMove( HWND hwnd, WORD wParam )
if( !hDragCursor ) iconic = FALSE; if( !hDragCursor ) iconic = FALSE;
} }
if( !iconic ) NC_DrawMovingFrame( hdc, &sizingRect, thickframe ); /* invert frame if WIN31_LOOK to indicate mouse click on caption */
if( !iconic && TWEAK_WineLook == WIN31_LOOK )
NC_DrawMovingFrame( hdc, &sizingRect, thickframe );
while(1) while(1)
{ {
...@@ -2244,12 +2246,16 @@ static void NC_DoSizeMove( HWND hwnd, WORD wParam ) ...@@ -2244,12 +2246,16 @@ static void NC_DoSizeMove( HWND hwnd, WORD wParam )
if( !moved ) if( !moved )
{ {
moved = TRUE; moved = TRUE;
if( iconic ) /* ok, no system popup tracking */
if( iconic ) /* ok, no system popup tracking */
{ {
hOldCursor = SetCursor(hDragCursor); hOldCursor = SetCursor(hDragCursor);
ShowCursor( TRUE ); ShowCursor( TRUE );
WINPOS_ShowIconTitle( wndPtr, FALSE ); WINPOS_ShowIconTitle( wndPtr, FALSE );
} } else if(TWEAK_WineLook != WIN31_LOOK)
{
NC_DrawMovingFrame( hdc, &sizingRect, thickframe );
}
} }
if (msg.message == WM_KEYDOWN) SetCursorPos( pt.x, pt.y ); if (msg.message == WM_KEYDOWN) SetCursorPos( pt.x, pt.y );
...@@ -2287,15 +2293,13 @@ static void NC_DoSizeMove( HWND hwnd, WORD wParam ) ...@@ -2287,15 +2293,13 @@ static void NC_DoSizeMove( HWND hwnd, WORD wParam )
} }
DestroyCursor( hDragCursor ); DestroyCursor( hDragCursor );
} }
else else if(moved || TWEAK_WineLook == WIN31_LOOK)
NC_DrawMovingFrame( hdc, &sizingRect, thickframe ); NC_DrawMovingFrame( hdc, &sizingRect, thickframe );
if (wndPtr->dwStyle & WS_CHILD) if (wndPtr->dwStyle & WS_CHILD)
ReleaseDC( wndPtr->parent->hwndSelf, hdc ); ReleaseDC( wndPtr->parent->hwndSelf, hdc );
else else
{ ReleaseDC( 0, hdc );
ReleaseDC( 0, hdc );
}
wndPtr->pDriver->pPostSizeMove(wndPtr); wndPtr->pDriver->pPostSizeMove(wndPtr);
......
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