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 change to 37fd105

Browse Source
This commit is contained in:
Birunthan Mohanathas 2013-07-31 13:12:15 +03:00
parent 37fd105650
commit 3c8c8a1f5e
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Common/Gfx/CanvasD2D.cpp
View File

@ -377,8 +377,11 @@ bool CanvasD2D::MeasureTextLinesW(const WCHAR* str, UINT strLen, const TextForma
const DWRITE_TEXT_METRICS metrics =
Util::GetAdjustedDWriteTextLayoutMetrics(textLayout.Get(), !m_AccurateText);
rect.Width = metrics.width;
rect.Height = metrics.height;
lines = metrics.lineCount;
// GDI+ draws multi-line text even though the last line may be clipped slightly at the bottom.
// This is a workaround to emulate that behaviour.
rect.Height = metrics.height + 1.0f;
return true;
}

6
Common/Gfx/Util/DWriteHelpers.cpp
View File

@ -36,12 +36,6 @@ DWRITE_TEXT_METRICS GetAdjustedDWriteTextLayoutMetrics(
metrics.width = floor(metrics.width + (size / 2.05f) + (metrics.width / 55.0f) - 0.5f);
metrics.height = floor(metrics.height + (size / 9.25f) + 0.3f);
}
else
{
// GDI+ draws multi-line text even though the last line may be clipped slightly at the bottom.
// This is a workaround to emulate that behaviour.
metrics.height += 1.0f;
}
return metrics;
}