[WIN32K]

- addendum to revision 64877 which slightly changed UserDrawCaption's logic
- fixes window title being drawn over the icon

svn path=/trunk/; revision=65087

diff --git a/reactos/win32ss/user/ntuser/painting.c b/reactos/win32ss/user/ntuser/painting.c
index c6335fb..3b1d693 100644 (file)
--- a/reactos/win32ss/user/ntuser/painting.c
+++ b/reactos/win32ss/user/ntuser/painting.c
@@ -2143,9 +2143,13 @@ BOOL UserDrawCaption(
          UserDrawIconEx(hDc, x, y, pIcon, cx, cy, 0, NULL, DI_NORMAL);
          UserDereferenceObject(pIcon);
       }
          UserDrawIconEx(hDc, x, y, pIcon, cx, cy, 0, NULL, DI_NORMAL);
          UserDereferenceObject(pIcon);
       }

+      else
+      {
+          HasIcon = FALSE;
+      }

    }
 
    }
 

-   if (hIcon)
+   if (HasIcon)

       Rect.left += Rect.bottom - Rect.top;
 
    if((uFlags & DC_TEXT))
       Rect.left += Rect.bottom - Rect.top;
 
    if((uFlags & DC_TEXT))