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

fixed calculation of getwindowsize for spinedit, because edit and updown control may overlap (issue #1993)

Browse Source 
git-svn-id: trunk@9130 -
This commit is contained in:
vincents 2006-04-15 20:28:34 +00:00
parent 9bc02c5002
commit bc0d1b29f9
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -313,21 +313,22 @@ begin
destroyCaptionTokens(captionTokens);
end;
function MenuItemHeight(const aMenuItem: TMenuItem; const aHDC: HDC): integer;
function MenuItemHeight(const AMenuItem: TMenuItem; const aHDC: HDC): integer;
var captionTokens: TList;
decoration: TCaptionFlagsSet;
begin
if aMenuItem.Caption = '-' then Result := 10
else begin
Result := 10;
if aMenuItem.Caption <> '-' then begin
Result := GetSystemMetrics(SM_CYMENU) - 2;
if aMenuItem.Default then decoration := [cfBold]
else decoration := [];
captionTokens := parseMenuItemCaption('&', aMenuItem.Caption, decoration);
Result := MenuCaptionHeight(captionTokens, aHDC);
if aMenuItem.hasIcon and (aMenuItem.bitmap.height > Result) then
Result := aMenuItem.bitmap.height;
Result := Result + 2;
destroyCaptionTokens(captionTokens);
Result := Max(MenuCaptionHeight(captionTokens, aHDC) + 2, Result);
DestroyCaptionTokens(captionTokens);
if aMenuItem.hasIcon then
Result := Max(aMenuItem.bitmap.height +3, Result);
end;
DebugLn('MenuItemHeight ', AMenuItem.Caption, ' ', Dbgs(Result));
end;
function MenuIconWidth(AMenuItem: TMenuItem): integer;