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

cocoa: allowing a designed form to activate (and focus). #34718

Browse Source 
git-svn-id: trunk@61471 -
This commit is contained in:
dmitry 2019-06-24 20:05:43 +00:00
parent 5e39875ae0
commit b06a651094
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lcl/interfaces/cocoa/cocoawsforms.pas
View File

@ -351,28 +351,36 @@ end;
procedure TLCLWindowCallback.Activate;
var
ACustForm: TCustomForm;
isDesign: Boolean;
begin
if not IsActivating then
begin
IsActivating:=True;
ACustForm := Target as TCustomForm;
if (csDesigning in ACustForm.ComponentState)
or (Assigned(ACustForm.Menu) and (csDesigning in ACustForm.Menu.ComponentState))
then Exit;
isDesign :=
(csDesigning in ACustForm.ComponentState)
or (
Assigned(ACustForm.Menu)
and (csDesigning in ACustForm.Menu.ComponentState)
);
if (ACustForm.Menu <> nil) and
(ACustForm.Menu.HandleAllocated) then
// only adjust main menu, if the form is not being designed
if not isDesign then
begin
if NSObject(ACustForm.Menu.Handle).isKindOfClass_(TCocoaMenu) then
if (ACustForm.Menu <> nil) and
(ACustForm.Menu.HandleAllocated) then
begin
CocoaWidgetSet.SetMainMenu(ACustForm.Menu.Handle, ACustForm.Menu);
if NSObject(ACustForm.Menu.Handle).isKindOfClass_(TCocoaMenu) then
begin
CocoaWidgetSet.SetMainMenu(ACustForm.Menu.Handle, ACustForm.Menu);
end
else
debugln('Warning: Menu does not have a valid handle.');
end
else
debugln('Warning: Menu does not have a valid handle.');
end
else
CocoaWidgetSet.SetMainMenu(0, nil);
CocoaWidgetSet.SetMainMenu(0, nil);
end;
LCLSendActivateMsg(Target, WA_ACTIVE, false);
LCLSendSetFocusMsg(Target);