Skip to content

ttf fonts were not always regenareted using setFont on win32 #4365

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

Closed
wants to merge 1 commit into from
Closed

ttf fonts were not always regenareted using setFont on win32 #4365

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
33 changes: 17 additions & 16 deletions cocos2dx/platform/win32/CCImage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,25 +152,26 @@ class BitmapDC
pwszBuffer = NULL;
}
}
if (fontPath.size() > 0)
m_curFontPath = fontPath;
else
m_curFontPath.clear();
// register temp font
if (m_curFontPath.size() > 0)
}
if (fontPath.size() > 0)
m_curFontPath = fontPath;
else
m_curFontPath.clear();
// register temp font
if (m_curFontPath.size() > 0)
{
wchar_t * pwszBuffer = utf8ToUtf16(m_curFontPath);
if (pwszBuffer)
{
wchar_t * pwszBuffer = utf8ToUtf16(m_curFontPath);
if (pwszBuffer)
if(AddFontResource(pwszBuffer))
{
if(AddFontResource(pwszBuffer))
{
SendMessage( m_hWnd, WM_FONTCHANGE, 0, 0);
}
delete [] pwszBuffer;
pwszBuffer = NULL;
}
SendMessage( m_hWnd, WM_FONTCHANGE, 0, 0);
}
delete [] pwszBuffer;
pwszBuffer = NULL;
}
}
}

m_hFont = NULL;

// disable Cleartype
Expand Down