mirror of
https://github.com/reactos/reactos.git
synced 2024-06-29 01:12:06 +00:00
[Win32k]
- Fix typo, see CORE-9989. - Add caption text is truncated flag support. svn path=/trunk/; revision=68622
This commit is contained in:
parent
085f7653ed
commit
3b0dfe2c25
|
@ -685,7 +685,7 @@ IntInvalidateWindows(PWND Wnd, PREGION Rgn, ULONG Flags)
|
|||
}
|
||||
else
|
||||
{
|
||||
RgnType == NULLREGION;
|
||||
RgnType = NULLREGION;
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -1882,6 +1882,7 @@ UserDrawCaptionText(
|
|||
NTSTATUS Status;
|
||||
BOOLEAN bDeleteFont = FALSE;
|
||||
SIZE Size;
|
||||
BOOL Ret = TRUE;
|
||||
ULONG fit = 0, Length;
|
||||
WCHAR szText[128];
|
||||
RECTL r = *lpRc;
|
||||
|
@ -1942,6 +1943,7 @@ UserDrawCaptionText(
|
|||
if (Text->Length/sizeof(WCHAR) > Length && Length > 3)
|
||||
{
|
||||
RtlCopyMemory(&szText[Length-3], ELLIPSISW, sizeof(ELLIPSISW));
|
||||
Ret = FALSE;
|
||||
}
|
||||
|
||||
GreExtTextOutW( hDc,
|
||||
|
@ -1962,9 +1964,12 @@ UserDrawCaptionText(
|
|||
if (bDeleteFont)
|
||||
GreDeleteObject(hFont);
|
||||
|
||||
return TRUE;
|
||||
return Ret;
|
||||
}
|
||||
|
||||
//
|
||||
// This draws Buttons, Icons and Text...
|
||||
//
|
||||
BOOL UserDrawCaption(
|
||||
PWND pWnd,
|
||||
HDC hDc,
|
||||
|
@ -2087,17 +2092,25 @@ BOOL UserDrawCaption(
|
|||
|
||||
if((uFlags & DC_TEXT))
|
||||
{
|
||||
BOOL Set = FALSE;
|
||||
Rect.left += 2;
|
||||
|
||||
if (Str)
|
||||
UserDrawCaptionText(pWnd, hDc, Str, &Rect, uFlags, hFont);
|
||||
Set = UserDrawCaptionText(pWnd, hDc, Str, &Rect, uFlags, hFont);
|
||||
else if (pWnd != NULL) // FIXME: Windows does not do that
|
||||
{
|
||||
UNICODE_STRING ustr;
|
||||
ustr.Buffer = pWnd->strName.Buffer; // FIXME: LARGE_STRING truncated!
|
||||
ustr.Length = (USHORT)min(pWnd->strName.Length, MAXUSHORT);
|
||||
ustr.MaximumLength = (USHORT)min(pWnd->strName.MaximumLength, MAXUSHORT);
|
||||
UserDrawCaptionText(pWnd, hDc, &ustr, &Rect, uFlags, hFont);
|
||||
Set = UserDrawCaptionText(pWnd, hDc, &ustr, &Rect, uFlags, hFont);
|
||||
}
|
||||
if (pWnd)
|
||||
{
|
||||
if (Set)
|
||||
pWnd->state2 &= ~WNDS2_CAPTIONTEXTTRUNCATED;
|
||||
else
|
||||
pWnd->state2 |= WNDS2_CAPTIONTEXTTRUNCATED;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue