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

Gfx: Check for errors in TextFormatD2D::SetProperties

Browse Source
This commit is contained in:
Birunthan Mohanathas 2013-08-10 15:25:36 +03:00
parent 2e2ced7403
commit 34abccc29b
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Common/Gfx/TextFormatD2D.cpp
View File

@ -37,6 +37,9 @@ void TextFormatD2D::Dispose()
m_TextFormat.Reset(); m_TextFormat.Reset();
m_TextLayout.Reset(); m_TextLayout.Reset();
m_InlineEllipsis.Reset(); m_InlineEllipsis.Reset();
m_ExtraHeight = 0.0f;
m_LineGap = 0.0f;
} }
void TextFormatD2D::CreateLayout( void TextFormatD2D::CreateLayout(
@ -160,23 +163,28 @@ void TextFormatD2D::SetProperties(
SetHorizontalAlignment(GetHorizontalAlignment()); SetHorizontalAlignment(GetHorizontalAlignment());
SetVerticalAlignment(GetVerticalAlignment()); SetVerticalAlignment(GetVerticalAlignment());
// TODO: Clean this up and check for errors. // Get the family name to in case CreateTextFormat() fallbacked on some other family name.
Microsoft::WRL::ComPtr<IDWriteFontCollection> collection; hr = m_TextFormat->GetFontFamilyName(dwriteFamilyName, _countof(dwriteFamilyName));
m_TextFormat->GetFontCollection(collection.GetAddressOf()); if (FAILED(hr)) return;
Microsoft::WRL::ComPtr<IDWriteFontCollection> collection;
Microsoft::WRL::ComPtr<IDWriteFontFamily> fontFamily;
UINT32 familyNameIndex; UINT32 familyNameIndex;
BOOL exists; BOOL exists;
collection->FindFamilyName(dwriteFamilyName, &familyNameIndex, &exists); if (FAILED(m_TextFormat->GetFontCollection(collection.GetAddressOf())) ||
FAILED(collection->FindFamilyName(dwriteFamilyName, &familyNameIndex, &exists)) ||
Microsoft::WRL::ComPtr<IDWriteFontFamily> fontFamily; FAILED(collection->GetFontFamily(familyNameIndex, fontFamily.GetAddressOf())))
collection->GetFontFamily(familyNameIndex, fontFamily.GetAddressOf()); {
return;
}
Microsoft::WRL::ComPtr<IDWriteFont> font; Microsoft::WRL::ComPtr<IDWriteFont> font;
fontFamily->GetFirstMatchingFont( hr = fontFamily->GetFirstMatchingFont(
m_TextFormat->GetFontWeight(), m_TextFormat->GetFontWeight(),
m_TextFormat->GetFontStretch(), m_TextFormat->GetFontStretch(),
m_TextFormat->GetFontStyle(), m_TextFormat->GetFontStyle(),
font.GetAddressOf()); font.GetAddressOf());
if (FAILED(hr)) return;
DWRITE_FONT_METRICS fmetrics; DWRITE_FONT_METRICS fmetrics;
font->GetMetrics(&fmetrics); font->GetMetrics(&fmetrics);