Commit 3765b330 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

user32: Paint title bars for minimized windows.

parent 04707a34
...@@ -430,8 +430,6 @@ static void NC_GetInsideRect( HWND hwnd, enum coords_relative relative, RECT *re ...@@ -430,8 +430,6 @@ static void NC_GetInsideRect( HWND hwnd, enum coords_relative relative, RECT *re
{ {
WIN_GetRectangles( hwnd, relative, rect, NULL ); WIN_GetRectangles( hwnd, relative, rect, NULL );
if (style & WS_MINIMIZE) return;
/* Remove frame from rectangle */ /* Remove frame from rectangle */
if (HAS_THICKFRAME( style, ex_style )) if (HAS_THICKFRAME( style, ex_style ))
{ {
...@@ -955,9 +953,6 @@ static void NC_DoNCPaint( HWND hwnd, HRGN clip ) ...@@ -955,9 +953,6 @@ static void NC_DoNCPaint( HWND hwnd, HRGN clip )
flags = wndPtr->flags; flags = wndPtr->flags;
WIN_ReleasePtr( wndPtr ); WIN_ReleasePtr( wndPtr );
if ( dwStyle & WS_MINIMIZE ||
!WIN_IsWindowDrawable( hwnd, 0 )) return; /* Nothing to do */
active = flags & WIN_NCACTIVATED; active = flags & WIN_NCACTIVATED;
TRACE("%p %d\n", hwnd, active ); TRACE("%p %d\n", hwnd, active );
...@@ -1065,10 +1060,7 @@ LRESULT NC_HandleNCPaint( HWND hwnd , HRGN clip) ...@@ -1065,10 +1060,7 @@ LRESULT NC_HandleNCPaint( HWND hwnd , HRGN clip)
if( dwStyle & WS_VISIBLE ) if( dwStyle & WS_VISIBLE )
{ {
if( dwStyle & WS_MINIMIZE ) NC_DoNCPaint( hwnd, clip );
WINPOS_RedrawIconTitle( hwnd );
else
NC_DoNCPaint( hwnd, clip );
if (parent == GetDesktopWindow()) if (parent == GetDesktopWindow())
PostMessageW( parent, WM_PARENTNOTIFY, WM_NCPAINT, (LPARAM)hwnd ); PostMessageW( parent, WM_PARENTNOTIFY, WM_NCPAINT, (LPARAM)hwnd );
...@@ -1097,10 +1089,7 @@ LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam, LPARAM lParam ) ...@@ -1097,10 +1089,7 @@ LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam, LPARAM lParam )
*/ */
if (lParam != -1) if (lParam != -1)
{ {
if (IsIconic(hwnd)) NC_DoNCPaint( hwnd, (HRGN)1 );
WINPOS_RedrawIconTitle( hwnd );
else
NC_DoNCPaint( hwnd, (HRGN)1 );
if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow())
PostMessageW( GetDesktopWindow(), WM_PARENTNOTIFY, WM_NCACTIVATE, (LPARAM)hwnd ); PostMessageW( GetDesktopWindow(), WM_PARENTNOTIFY, WM_NCACTIVATE, (LPARAM)hwnd );
...@@ -1372,17 +1361,14 @@ LRESULT NC_HandleNCLButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) ...@@ -1372,17 +1361,14 @@ LRESULT NC_HandleNCLButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam )
} }
case HTSYSMENU: case HTSYSMENU:
if( style & WS_SYSMENU ) if (style & WS_SYSMENU)
{ {
if( !(style & WS_MINIMIZE) ) HDC hDC = GetWindowDC( hwnd );
{ NC_DrawSysButton( hwnd, hDC, TRUE );
HDC hDC = GetWindowDC(hwnd); ReleaseDC( hwnd, hDC );
NC_DrawSysButton( hwnd, hDC, TRUE ); SendMessageW( hwnd, WM_SYSCOMMAND, SC_MOUSEMENU + HTSYSMENU, lParam );
ReleaseDC( hwnd, hDC ); }
} break;
SendMessageW( hwnd, WM_SYSCOMMAND, SC_MOUSEMENU + HTSYSMENU, lParam );
}
break;
case HTMENU: case HTMENU:
SendMessageW( hwnd, WM_SYSCOMMAND, SC_MOUSEMENU, lParam ); SendMessageW( hwnd, WM_SYSCOMMAND, SC_MOUSEMENU, lParam );
......
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