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: Additional changes to 56218f7

Browse Source
This commit is contained in:
Birunthan Mohanathas 2013-08-10 15:29:09 +03:00
parent 56218f7af4
commit 42e8d5ee22
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Common/Gfx/TextFormatD2D.cpp
View File

@ -83,6 +83,9 @@ void TextFormatD2D::CreateLayout(
textLayout1->SetCharacterSpacing(emOffset, emOffset, 0.0f, range); textLayout1->SetCharacterSpacing(emOffset, emOffset, 0.0f, range);
} }
// If only one line is visible, disable wrapping so that as much text as possible is shown
// after trimming.
// TODO: Fix this for when more than one line is visible.
UINT32 lineCount = 0; UINT32 lineCount = 0;
DWRITE_LINE_METRICS lineMetrics[2]; DWRITE_LINE_METRICS lineMetrics[2];
HRESULT hr = m_TextLayout->GetLineMetrics(lineMetrics, _countof(lineMetrics), &lineCount); HRESULT hr = m_TextLayout->GetLineMetrics(lineMetrics, _countof(lineMetrics), &lineCount);
@ -92,7 +95,6 @@ void TextFormatD2D::CreateLayout(
lineMetrics[1].height == 0.0f) lineMetrics[1].height == 0.0f)
{ {
m_TextLayout->SetWordWrapping(DWRITE_WORD_WRAPPING_NO_WRAP); m_TextLayout->SetWordWrapping(DWRITE_WORD_WRAPPING_NO_WRAP);
return;
} }
} }
} }