chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

String: Strip carriage returns in strings for compatibility between GDI+ and D2D

Browse Source
This commit is contained in:
Brian Ferguson 2013-10-13 16:28:57 +03:00 committed by Birunthan Mohanathas
parent b539c19b8f
commit 6d705f5c95
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Library/MeterString.cpp
View File

@ -387,18 +387,25 @@ bool MeterString::Update()
break;
}
// Ugly hack to make D2D render trailing spaces followed by a non-breaking space correctly.
// By default, D2D ignores all trailing whitespace. Both GDI+ and D2D, however, acknowledge the
// presense of the zero-width space (and give it a width of 0px), so we append the zero-width
// space after each non-breaking space.
for (size_t i = 0; i < m_String.length(); ++i)
{
if (m_String[i] == L'\u00A0' || // No-Break Space
m_String[i] == L'\u205F') // Medium Mathematical Space
{
// Ugly hack to make D2D render trailing spaces followed by a non-breaking space
// correctly. By default, D2D ignores all trailing whitespace. Both GDI+ and D2D,
// however, acknowledge the presense of the zero-width space (and give it a width
// of 0px), so we append the zero-width space after each non-breaking space.
++i;
m_String.insert(i, 1, L'\u200B');
}
else if (m_String[i] == L'\r')
{
// GDI+ seems to ignore carriage returns, so strip it entirely to make it behave
// similarly with D2D as well.
m_String.erase(i, 1);
--i;
}
}
if (!m_WDefined || !m_HDefined)