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: Fix text Y position for D2D with vertical Center/Bottom alignments

Browse Source
This commit is contained in:
Birunthan Mohanathas 2013-08-11 11:42:23 +03:00
parent 027feabf86
commit 180adbc759
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Common/Gfx/CanvasD2D.cpp
View File

@ -316,7 +316,6 @@ void CanvasD2D::DrawTextW(const WCHAR* str, UINT strLen, const TextFormat& forma
str, strLen, rect.Width, rect.Height, !m_AccurateText && m_TextAntiAliasing); str, strLen, rect.Width, rect.Height, !m_AccurateText && m_TextAntiAliasing);
D2D1_POINT_2F drawPosition; D2D1_POINT_2F drawPosition;
drawPosition.y = rect.Y - formatD2D.m_LineGap;
drawPosition.x = [&]() drawPosition.x = [&]()
{ {
if (!m_AccurateText) if (!m_AccurateText)
@ -332,6 +331,19 @@ void CanvasD2D::DrawTextW(const WCHAR* str, UINT strLen, const TextFormat& forma
return rect.X; return rect.X;
} (); } ();
drawPosition.y = [&]()
{
// GDI+ compatibility.
float yPos = rect.Y - formatD2D.m_LineGap;
switch (formatD2D.GetVerticalAlignment())
{
case VerticalAlignment::Bottom: yPos -= formatD2D.m_ExtraHeight; break;
case VerticalAlignment::Center: yPos -= formatD2D.m_ExtraHeight / 2; break;
}
return yPos;
} ();
DWRITE_OVERHANG_METRICS overhangMetrics; DWRITE_OVERHANG_METRICS overhangMetrics;
formatD2D.m_TextLayout->GetOverhangMetrics(&overhangMetrics); formatD2D.m_TextLayout->GetOverhangMetrics(&overhangMetrics);