paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-01 09:00:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL, Win32: Fix drawing vista menu caption. win returns TRect that include the bottom/left pixel. LCL does not.

Browse Source 
git-svn-id: trunk@44034 -
This commit is contained in:
martin 2014-02-12 21:07:28 +00:00
parent 867ec89c88
commit 3c570caa29
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lcl/interfaces/win32/win32wsmenus.pp
View File

@ -441,8 +441,9 @@ begin
W := UTF8ToUTF16(AMenuItem.Caption);
GetThemeTextExtent(Theme, DC, MENU_BARITEM, 0, PWideChar(W), Length(W),
DT_SINGLELINE or DT_LEFT or DT_EXPANDTABS, nil, TextRect);
Result.TextSize.cx := TextRect.Right - TextRect.Left;
Result.TextSize.cy := TextRect.Bottom - TextRect.Top;
// Those rects include the bottom-right, so we need + 1
Result.TextSize.cx := TextRect.Right - TextRect.Left + 1;
Result.TextSize.cy := TextRect.Bottom - TextRect.Top + 1;
if OldFont <> 0 then
DeleteObject(SelectObject(DC, OldFont));
end;
@ -623,8 +624,9 @@ begin
end;
// draw text
TextRect.Top := (TextRect.Top + TextRect.Bottom - Metrics.TextSize.cy) div 2;
TextRect.Bottom := TextRect.Top + Metrics.TextSize.cy;
// Those rects include the bottom-right, so we need + 1
TextRect.Top := (TextRect.Top + TextRect.Bottom + 1 - Metrics.TextSize.cy) div 2;
TextRect.Bottom := TextRect.Top + Metrics.TextSize.cy - 1;
TextFlags := DT_SINGLELINE or DT_EXPANDTABS;
if IsRightToLeft then
TextFlags := TextFlags or DT_RTLREADING;