Zebediah Figura : user32: Paint title bars for minimized windows.
Alexandre Julliard
julliard at winehq.org
Tue Feb 19 15:29:35 CST 2019
Module: wine
Branch: master
Commit: 3765b3307e772abf2430fe8e975ec5e72fc3d1f1
URL: https://source.winehq.org/git/wine.git/?a=commit;h=3765b3307e772abf2430fe8e975ec5e72fc3d1f1
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Tue Feb 19 12:17:42 2019 -0600
user32: Paint title bars for minimized windows.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/user32/nonclient.c | 34 ++++++++++------------------------
1 file changed, 10 insertions(+), 24 deletions(-)
diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c
index 0dea3a2..0e15e95 100644
--- a/dlls/user32/nonclient.c
+++ b/dlls/user32/nonclient.c
@@ -430,8 +430,6 @@ static void NC_GetInsideRect( HWND hwnd, enum coords_relative relative, RECT *re
{
WIN_GetRectangles( hwnd, relative, rect, NULL );
- if (style & WS_MINIMIZE) return;
-
/* Remove frame from rectangle */
if (HAS_THICKFRAME( style, ex_style ))
{
@@ -955,9 +953,6 @@ static void NC_DoNCPaint( HWND hwnd, HRGN clip )
flags = wndPtr->flags;
WIN_ReleasePtr( wndPtr );
- if ( dwStyle & WS_MINIMIZE ||
- !WIN_IsWindowDrawable( hwnd, 0 )) return; /* Nothing to do */
-
active = flags & WIN_NCACTIVATED;
TRACE("%p %d\n", hwnd, active );
@@ -1065,10 +1060,7 @@ LRESULT NC_HandleNCPaint( HWND hwnd , HRGN clip)
if( dwStyle & WS_VISIBLE )
{
- if( dwStyle & WS_MINIMIZE )
- WINPOS_RedrawIconTitle( hwnd );
- else
- NC_DoNCPaint( hwnd, clip );
+ NC_DoNCPaint( hwnd, clip );
if (parent == GetDesktopWindow())
PostMessageW( parent, WM_PARENTNOTIFY, WM_NCPAINT, (LPARAM)hwnd );
@@ -1097,10 +1089,7 @@ LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam, LPARAM lParam )
*/
if (lParam != -1)
{
- if (IsIconic(hwnd))
- WINPOS_RedrawIconTitle( hwnd );
- else
- NC_DoNCPaint( hwnd, (HRGN)1 );
+ NC_DoNCPaint( hwnd, (HRGN)1 );
if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow())
PostMessageW( GetDesktopWindow(), WM_PARENTNOTIFY, WM_NCACTIVATE, (LPARAM)hwnd );
@@ -1372,17 +1361,14 @@ LRESULT NC_HandleNCLButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam )
}
case HTSYSMENU:
- if( style & WS_SYSMENU )
- {
- if( !(style & WS_MINIMIZE) )
- {
- HDC hDC = GetWindowDC(hwnd);
- NC_DrawSysButton( hwnd, hDC, TRUE );
- ReleaseDC( hwnd, hDC );
- }
- SendMessageW( hwnd, WM_SYSCOMMAND, SC_MOUSEMENU + HTSYSMENU, lParam );
- }
- break;
+ if (style & WS_SYSMENU)
+ {
+ HDC hDC = GetWindowDC( hwnd );
+ NC_DrawSysButton( hwnd, hDC, TRUE );
+ ReleaseDC( hwnd, hDC );
+ SendMessageW( hwnd, WM_SYSCOMMAND, SC_MOUSEMENU + HTSYSMENU, lParam );
+ }
+ break;
case HTMENU:
SendMessageW( hwnd, WM_SYSCOMMAND, SC_MOUSEMENU, lParam );
More information about the wine-cvs
mailing list