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

Fixed: Wrong font is used due to the font caching problem.

Browse Source
This commit is contained in:
spx 2009-10-11 13:03:20 +00:00
parent 04f485a02e
commit 07c9f62e40
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Library/MeterString.cpp
View File

@ -164,7 +164,8 @@ void CMeterString::Initialize()
REAL size = (REAL)m_FontSize * (96.0f / (REAL)dpi); REAL size = (REAL)m_FontSize * (96.0f / (REAL)dpi);
std::map<std::wstring, Gdiplus::Font*>::iterator iter2 = c_Fonts.find(FontPropertiesToString(size, style)); std::wstring properties = FontPropertiesToString(m_FontFamily, size, style);
std::map<std::wstring, Gdiplus::Font*>::iterator iter2 = c_Fonts.find(properties);
if (iter2 != c_Fonts.end()) if (iter2 != c_Fonts.end())
{ {
m_Font = (*iter2).second; m_Font = (*iter2).second;
@ -179,13 +180,13 @@ void CMeterString::Initialize()
{ {
m_Font = new Gdiplus::Font(FontFamily::GenericSansSerif(), size, style); m_Font = new Gdiplus::Font(FontFamily::GenericSansSerif(), size, style);
} }
c_Fonts[FontPropertiesToString(size, style)] = m_Font; c_Fonts[properties] = m_Font;
}
Status status = m_Font->GetLastStatus(); Status status = m_Font->GetLastStatus();
if(Ok != status) if(Ok != status)
{ {
throw CError(std::wstring(L"Unable to create font: ") + m_FontFace, __LINE__, __FILE__); throw CError(std::wstring(L"Unable to create font: ") + m_FontFace, __LINE__, __FILE__);
}
} }
} }
@ -579,10 +580,19 @@ void CMeterString::FreeFontCache()
** Static helper to convert font properties to a string so it can be used as a key for the cache map. ** Static helper to convert font properties to a string so it can be used as a key for the cache map.
** **
*/ */
std::wstring CMeterString::FontPropertiesToString(REAL size, FontStyle style) std::wstring CMeterString::FontPropertiesToString(FontFamily* fontFamily, REAL size, FontStyle style)
{ {
std::wstringstream stream; std::wstringstream stream;
stream << size << L"-" << (int)style; stream << size << L"-" << (int)style;
if (fontFamily)
{
WCHAR familyName[LF_FACESIZE];
if (Ok == fontFamily->GetFamilyName(familyName))
{
return std::wstring(familyName) + L"-" + stream.str();
}
}
return stream.str(); return stream.str();
} }

2
Library/MeterString.h
View File

@ -86,7 +86,7 @@ private:
std::vector<std::wstring> m_MeasureNames; std::vector<std::wstring> m_MeasureNames;
std::vector<CMeasure*> m_Measures; std::vector<CMeasure*> m_Measures;
static std::wstring FontPropertiesToString(Gdiplus::REAL size, Gdiplus::FontStyle style); static std::wstring FontPropertiesToString(Gdiplus::FontFamily* fontFamily, Gdiplus::REAL size, Gdiplus::FontStyle style);
static std::map<std::wstring, Gdiplus::FontFamily*> c_FontFamilies; // Cache for the font families static std::map<std::wstring, Gdiplus::FontFamily*> c_FontFamilies; // Cache for the font families
static std::map<std::wstring, Gdiplus::Font*> c_Fonts; // Cache for the fonts static std::map<std::wstring, Gdiplus::Font*> c_Fonts; // Cache for the fonts
}; };