paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-30 15:10:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 55016 #69ffbd67a5, 55018-55019 #c5bb05f7c7-#c5bb05f7c7 from trunk:

Browse Source 
win32: menus: fix menu height calculation. Issue #31875
........
win32: menus: fix FPC 3.0.0 compilation. Issue #31875
........
win32: menus: fix menu height calculation. Issue #31875
........

git-svn-id: branches/fixes_1_8@55050 -
This commit is contained in:
maxim 2017-05-22 22:54:43 +00:00
parent 213dc57b27
commit 1248b89f4c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -474,7 +474,7 @@ begin
end
else
begin
Result.cy := Metrics.CheckSize.cy + Metrics.CheckMargins.cyTopHeight + Metrics.CheckMargins.cyBottomHeight;
Result.cy := Max(Metrics.TextSize.cy + 1, Metrics.CheckSize.cy + Metrics.CheckMargins.cyTopHeight + Metrics.CheckMargins.cyBottomHeight);
if AMenuItem.HasIcon then
begin
IconSize := AMenuItem.GetIconSize;
@ -730,8 +730,9 @@ begin
IconWidth := MenuIconWidth(AMenuItem);
CheckRect.Right := Max(CheckRect.Right, CheckRect.Left+IconWidth);
CheckRect.Bottom := Max(CheckRect.Bottom, CheckRect.Top+IconWidth);
OffsetRect(CheckRect, 0, (ARect.Bottom-ARect.Top-CheckRect.Bottom+CheckRect.Top) div 2);
// draw gutter
GutterRect := CheckRect;
GutterRect := Rect(0, ARect.Top, CheckRect.Right, ARect.Bottom);
GutterRect.Left := GutterRect.Right + Metrics.CheckBgMargins.cxRightWidth - Metrics.CheckMargins.cxRightWidth;
GutterRect.Right := GutterRect.Left + Metrics.GutterSize.cx;
Tmp := ThemeServices.GetElementDetails(tmPopupGutter);