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

Cocoa: Disable activation loop if NSWindow is not activatable

Browse Source 
git-svn-id: trunk@44072 -
This commit is contained in:
freq 2014-02-14 14:24:00 +00:00
parent a672e20451
commit d44ca788c7
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lcl/interfaces/cocoa/cocoawsforms.pp
View File

@ -35,7 +35,10 @@ type
{ TLCLWindowCallback }
TLCLWindowCallback = class(TLCLCommonCallBack, IWindowCallback)
private
IsActivating: boolean;
public
constructor Create(AOwner: NSObject; ATarget: TWinControl); override;
function CanActivate: Boolean; virtual;
procedure Activate; virtual;
procedure Deactivate; virtual;
@ -247,29 +250,41 @@ begin
Result := Enabled;
end;
constructor TLCLWindowCallback.Create(AOwner: NSObject; ATarget: TWinControl);
begin
inherited;
IsActivating:=false;
end;
procedure TLCLWindowCallback.Activate;
var
ACustForm: TCustomForm;
begin
ACustForm := Target as TCustomForm;
if (ACustForm.Menu <> nil) and
(ACustForm.Menu.HandleAllocated) then
if not IsActivating then
begin
if NSObject(ACustForm.Menu.Handle).isKindOfClass_(TCocoaMenuItem) then
IsActivating:=True;
ACustForm := Target as TCustomForm;
if (ACustForm.Menu <> nil) and
(ACustForm.Menu.HandleAllocated) then
begin
if TCocoaMenuItem(ACustForm.Menu.Handle).hasSubmenu then
CocoaWidgetSet.SetMainMenu(HMENU(TCocoaMenuItem(ACustForm.Menu.Handle).submenu))
if NSObject(ACustForm.Menu.Handle).isKindOfClass_(TCocoaMenuItem) then
begin
if TCocoaMenuItem(ACustForm.Menu.Handle).hasSubmenu then
CocoaWidgetSet.SetMainMenu(HMENU(TCocoaMenuItem(ACustForm.Menu.Handle).submenu))
else
debugln('Warning: Menu does not have a valid handle.');
end
else
debugln('Warning: Menu does not have a valid handle.');
CocoaWidgetSet.SetMainMenu(ACustForm.Menu.Handle);
end
else
CocoaWidgetSet.SetMainMenu(ACustForm.Menu.Handle);
end
else
CocoaWidgetSet.SetMainMenu(0);
LCLSendActivateMsg(Target, WA_ACTIVE, false);
LCLSendSetFocusMsg(Target);
CocoaWidgetSet.SetMainMenu(0);
LCLSendActivateMsg(Target, WA_ACTIVE, false);
LCLSendSetFocusMsg(Target);
IsActivating:=False;
end;
end;
procedure TLCLWindowCallback.Deactivate;