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

Merge branch 'lcl/cocoa/menu' into 'main'

Browse Source 
FIX: Cocoa: Arithmetic Overflow in menus (issue #40167 related)

See merge request freepascal.org/lazarus/lazarus!154
This commit is contained in:
Maxim Ganetsky 2023-05-11 15:33:31 +00:00
commit 255fc87ed1
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lcl/interfaces/cocoa/cocoawsmenus.pas
View File

@ -209,31 +209,24 @@ var
procedure MenuTrackStarted(mn: NSMenu);
begin
if menuTrack = nil then menuTrack := NSMutableArray.alloc.init;
if not Assigned(menuTrack) then menuTrack := NSMutableArray.alloc.init;
menuTrack.addObject(mn);
end;
procedure MenuTrackEnded(mn: NSMenu);
var
i : integer;
begin
if menuTrack = nil then
// it's possible if popup menu was used, without mainmenu in the app
Exit;
i := menuTrack.indexOfObject(mn);
if i >= 0 then
menuTrack.removeObjectAtIndex(i);
if Assigned(menuTrack) then
menuTrack.removeObject(mn);
end;
procedure MenuTrackCancelAll;
var
i : integer;
mn : NSMenu;
begin
if menuTrack = nil then Exit;
for i:=menuTrack.count - 1 downto 0 do begin
mn := NSMenu(menuTrack.objectAtIndex(i));
if not Assigned(menuTrack) then Exit;
if menuTrack.count = 0 then Exit;
for mn in menuTrack do
begin
if Assigned(mn) then
mn.cancelTracking;
end;
@ -449,7 +442,6 @@ begin
item.setSubmenu(itemSubMenu);
itemSubMenu.release;
NSApplication(NSApp).setServicesMenu(item.submenu);
item.release;
// Separator
submenu.insertItem_atIndex(NSMenuItem.separatorItem, submenu.itemArray.count);
@ -457,17 +449,14 @@ begin
// Hide App Meta-H
item := LCLMenuItemInit( TCocoaMenuItem_HideApp.alloc, Format(rsMacOSMenuHide, [Application.Title]), VK_H, [ssMeta]);
submenu.insertItem_atIndex(item, submenu.itemArray.count);
item.release;
// Hide Others Meta-Alt-H
item := LCLMenuItemInit( TCocoaMenuItem_HideOthers.alloc, rsMacOSMenuHideOthers, VK_H, [ssMeta, ssAlt]);
submenu.insertItem_atIndex(item, submenu.itemArray.count);
item.release;
// Show All
item := LCLMenuItemInit( TCocoaMenuItem_ShowAllApp.alloc, rsMacOSMenuShowAll);
submenu.insertItem_atIndex(item, submenu.itemArray.count);
item.release;
// Separator
submenu.insertItem_atIndex(NSMenuItem.separatorItem, submenu.itemArray.count);
@ -475,7 +464,6 @@ begin
// Quit Meta-Q
item := LCLMenuItemInit( TCocoaMenuItem_Quit.alloc, Format(rsMacOSMenuQuit, [Application.Title]), VK_Q, [ssMeta]);
submenu.insertItem_atIndex(item, submenu.itemArray.count);
item.release;
attachedAppleMenuItems := True;
end;