Author: khornicek
Date: Tue Oct 28 21:38:26 2014
New Revision: 65087
URL: http://svn.reactos.org/svn/reactos?rev=65087&view=rev
Log:
[WIN32K]
- addendum to revision 64877 which slightly changed UserDrawCaption's logic
- fixes window title being drawn over the icon
Modified:
trunk/reactos/win32ss/user/ntuser/painting.c
Modified: trunk/reactos/win32ss/user/ntuser/painting.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painting.c?rev=65087&r1=65086&r2=65087&view=diff
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Tue Oct 28
21:38:26 2014
@@ -2143,9 +2143,13 @@
UserDrawIconEx(hDc, x, y, pIcon, cx, cy, 0, NULL, DI_NORMAL);
UserDereferenceObject(pIcon);
}
- }
-
- if (hIcon)
+ else
+ {
+ HasIcon = FALSE;
+ }
+ }
+
+ if (HasIcon)
Rect.left += Rect.bottom - Rect.top;
if((uFlags & DC_TEXT))
