Skip to content

refine CCDevice-win32 BitmapDC #19144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 7, 2018
Merged

refine CCDevice-win32 BitmapDC #19144

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 5 additions & 44 deletions cocos/platform/win32/CCDevice-win32.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ class BitmapDC
CC_BREAK_IF(!pszText || nLen <= 0);

RECT rc = { 0, 0, 0, 0 };
DWORD dwCalcFmt = DT_CALCRECT;
DWORD dwCalcFmt = DT_CALCRECT | DT_NOPREFIX;
if (!enableWrap)
{
dwCalcFmt |= DT_SINGLELINE;
Expand Down Expand Up @@ -298,12 +298,11 @@ class BitmapDC
{
int nRet = 0;
wchar_t * pwszBuffer = nullptr;
wchar_t* fixedText = nullptr;
do
{
CC_BREAK_IF(!pszText);

DWORD dwFmt = DT_WORDBREAK;
DWORD dwFmt = DT_WORDBREAK | DT_NOPREFIX;
if (!enableWrap) {
dwFmt |= DT_SINGLELINE;
}
Expand Down Expand Up @@ -332,37 +331,7 @@ class BitmapDC
memset(pwszBuffer, 0, sizeof(wchar_t)*nBufLen);
nLen = MultiByteToWideChar(CP_UTF8, 0, pszText, nLen, pwszBuffer, nBufLen);

if (strchr(pszText, '&'))
{
fixedText = new wchar_t[nLen * 2 + 1];
int fixedIndex = 0;
for (int index = 0; index < nLen; ++index)
{
if (pwszBuffer[index] == '&')
{
fixedText[fixedIndex] = '&';
fixedText[fixedIndex + 1] = '&';
fixedIndex += 2;
}
else
{
fixedText[fixedIndex] = pwszBuffer[index];
fixedIndex += 1;
}
}
fixedText[fixedIndex] = '\0';
nLen = fixedIndex;
}

SIZE newSize;
if (fixedText)
{
newSize = sizeWithText(fixedText, nLen, dwFmt, fontName, textSize, tSize.cx, tSize.cy, enableWrap, overflow);
}
else
{
newSize = sizeWithText(pwszBuffer, nLen, dwFmt, fontName, textSize, tSize.cx, tSize.cy, enableWrap, overflow);
}
SIZE newSize = sizeWithText(pwszBuffer, nLen, dwFmt, fontName, textSize, tSize.cx, tSize.cy, enableWrap, overflow);

RECT rcText = { 0 };
// if content width is 0, use text size as content size
Expand Down Expand Up @@ -429,20 +398,12 @@ class BitmapDC
SetTextColor(_DC, RGB(255, 255, 255)); // white color

// draw text
if (fixedText)
{
nRet = DrawTextW(_DC, fixedText, nLen, &rcText, dwFmt);
}
else
{
nRet = DrawTextW(_DC, pwszBuffer, nLen, &rcText, dwFmt);
}
nRet = DrawTextW(_DC, pwszBuffer, nLen, &rcText, dwFmt);

SelectObject(_DC, hOldBmp);
SelectObject(_DC, hOldFont);
} while (0);
CC_SAFE_DELETE_ARRAY(pwszBuffer);
delete[] fixedText;

return nRet;
}
Expand Down Expand Up @@ -558,4 +519,4 @@ void Device::vibrate(float duration)

NS_CC_END

#endif // CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
#endif // CC_TARGET_PLATFORM == CC_PLATFORM_WIN32