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

Menu designer: Improve variable usage and visibility in TMenuDesigner.GetItemCounts.

Browse Source 
git-svn-id: trunk@51488 -
This commit is contained in:
juha 2016-02-03 20:17:19 +00:00
parent 52af02512e
commit b205f54650
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
designer/menueditorform.pas
View File

@ -296,13 +296,12 @@ end;
function TMenuDesigner.GetItemCounts(out aCaptionedItemCount,
aShortcutItemCount, anIconCount, anAccelCount: integer): integer;
var
i, imgCount: integer;
hasImages: boolean;
sc: TShortCut;
imgCount: integer;
procedure ProcessItems(aMI: TMenuItem);
var
i: integer;
sc: TShortCut;
begin
Inc(Result);
if not aMI.IsLine and (aMI.Caption <> '') then begin
@ -312,26 +311,28 @@ var
end;
if (aMI.ShortCut <> 0) or (aMI.ShortCutKey2 <> 0) then
Inc(aShortcutItemCount);
if hasImages and (aMI.ImageIndex > -1) and (aMI.ImageIndex < imgCount) then
if (imgCount > 0) and (aMI.ImageIndex > -1) and (aMI.ImageIndex < imgCount) then
Inc(anIconCount)
else if aMI.HasBitmap and not aMI.Bitmap.Empty then
Inc(anIconCount);
for i:=0 to aMI.Count-1 do
ProcessItems(aMI.Items[i]);
ProcessItems(aMI.Items[i]); // Recursive call for sub-menus.
end;
var
i: integer;
begin
if (FEditedMenu = nil) then
Exit;
aCaptionedItemCount:=0;
aShortcutItemCount:=0;
anIconCount:=0;
imgCount:=0;
anAccelCount:=0;
if (FEditedMenu.Images <> nil) and (FEditedMenu.Images.Count > 0) then
imgCount:=FEditedMenu.Images.Count
else
imgCount:=0;
Result:=0;
hasImages:=(FEditedMenu.Images <> nil) and (FEditedMenu.Images.Count > 0);
if hasImages then
imgCount:=FEditedMenu.Images.Count;
for i:=0 to FEditedMenu.Items.Count-1 do
ProcessItems(FEditedMenu.Items[i]);
end;