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

Reverted 32fc794 and cd35729

Browse Source
This commit is contained in:
Brian Ferguson
2013-07-20 10:09:37 -06:00
parent d67db33ecf
commit 96f27fffcb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Common/Gfx/CanvasD2D.cpp
View File

@@ -334,7 +334,7 @@ bool CanvasD2D::MeasureTextW(const WCHAR* str, UINT strLen, const TextFormat& fo
{ {
DWRITE_TEXT_METRICS metrics; DWRITE_TEXT_METRICS metrics;
textLayout->GetMetrics(&metrics); textLayout->GetMetrics(&metrics);
rect.Width = metrics.widthIncludingTrailingWhitespace + 5.0f; rect.Width = metrics.width + 5.0f;
rect.Height = metrics.height + 1.0f; // 1.0f to get same result as GDI+. rect.Height = metrics.height + 1.0f; // 1.0f to get same result as GDI+.
return true; return true;
} }
@@ -358,7 +358,7 @@ bool CanvasD2D::MeasureTextLinesW(const WCHAR* str, UINT strLen, const TextForma
{ {
DWRITE_TEXT_METRICS metrics; DWRITE_TEXT_METRICS metrics;
textLayout->GetMetrics(&metrics); textLayout->GetMetrics(&metrics);
rect.Width = metrics.widthIncludingTrailingWhitespace + 5.0f; rect.Width = metrics.width + 5.0f;
rect.Height = metrics.height + 1.0f; // 1.0f to get same result as GDI+. rect.Height = metrics.height + 1.0f; // 1.0f to get same result as GDI+.
lines = metrics.lineCount; lines = metrics.lineCount;
return true; return true;