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

cocoa: restore LM_ACTIVE sending for menus, when menuNeedsUpdate is called. #30808

Browse Source 
git-svn-id: trunk@61261 -
This commit is contained in:
dmitry 2019-05-21 17:40:09 +00:00
parent 79e367e184
commit 473ea12b96
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,8 +83,10 @@ type
procedure lclClearCallback; override;
procedure attachAppleMenuItems(); message 'attachAppleMenuItems';
function isValidAppleMenu(): LCLObjCBoolean; message 'isValidAppleMenu';
// menuWillOpen cannot be used. Because it SHOULD NOT change the contents
// of the menu. While LCL allows to modify the menu contents when the submenu
// is about to be activated.
procedure menuNeedsUpdate(AMenu: NSMenu); message 'menuNeedsUpdate:';
procedure menuWillOpen(AMenu: NSMenu); message 'menuWillOpen:';
end;
TCocoaMenuItem_HideApp = objcclass(NSMenuItem)
@ -380,16 +382,7 @@ procedure TCocoaMenuItem.menuNeedsUpdate(AMenu: NSMenu);
begin
if not Assigned(menuItemCallback) then Exit;
//todo: call "measureItem"
end;
procedure TCocoaMenuItem.menuWillOpen(AMenu: NSMenu);
var
Msg:TLMessage;
begin
FillChar(Msg{%H-}, SizeOf(Msg), 0);
Msg.msg := LM_ACTIVATE;
// debugln('send LM_Activate');
LCLMessageGlue.DeliverMessage(FMenuItemTarget,Msg);
menuItemCallback.ItemSelected;
end;
procedure TCocoaMenuItem_HideApp.lclItemSelected(sender: id);