paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-15 23:20:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cocoa: Fix #40484: calling TApplication.ProcessMessages() issue before entering RunLoop

Browse Source
This commit is contained in:
rich2014 2023-09-02 17:53:44 +08:00
parent 858c6931fc
commit 6c5322e24c
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lcl/interfaces/cocoa/cocoaint.pas
View File

@ -157,6 +157,9 @@ type
function RetainToCollect: Integer;
procedure ReleaseToCollect(fromIdx: integer);
function nextEvent(const eventExpDate: NSDate): NSEvent;
function nextEventBeforeRunLoop(const eventExpDate: NSDate): NSEvent;
procedure SyncClipboard();
function PromptUser(const DialogCaption, DialogMessage: String;

37
lcl/interfaces/cocoa/cocoaobject.inc
View File

@ -77,6 +77,34 @@ begin
end;
end;
function TCocoaWidgetSet.nextEvent(const eventExpDate: NSDate): NSEvent;
begin
{$ifdef BOOLFIX}
Result := NSApp.nextEventMatchingMask_untilDate_inMode_dequeue_(NSAnyEventMask, eventExpDate, NSDefaultRunLoopMode, Ord(true));
{$else}
Result := NSApp.nextEventMatchingMask_untilDate_inMode_dequeue(NSAnyEventMask, eventExpDate, NSDefaultRunLoopMode, true);
{$endif}
end;
// before entering RunLoop (TCocoaWidgetSet.AppRun), APP may call
// TApplication.ProcessMessages (for example, to display Splash Form in IDE).
// because it has not yet entered the message processing loop, nextEvent should
// be called multiple times to ensure various asynchronous callback situations.
// otherwise, it will cause some strange problems, and it is difficult to find
// the reason, such as the display problem of Splash Form.
// see also: https://gitlab.com/freepascal.org/lazarus/lazarus/-/issues/40484
function TCocoaWidgetSet.nextEventBeforeRunLoop(const eventExpDate: NSDate): NSEvent;
var
i: Integer;
begin
for i := 1 to 3 do
begin
Result := nextEvent(eventExpDate);
if Assigned(Result) then
break;
end;
end;
procedure TCocoaWidgetSet.AppRunMessages(onlyOne: Boolean; eventExpDate: NSDate);
var
event: NSEvent;
@ -84,11 +112,10 @@ var
begin
repeat
pool := NSAutoreleasePool.alloc.init;
{$ifdef BOOLFIX}
event := NSApp.nextEventMatchingMask_untilDate_inMode_dequeue_(NSAnyEventMask, eventExpDate, NSDefaultRunLoopMode, Ord(true));
{$else}
event := NSApp.nextEventMatchingMask_untilDate_inMode_dequeue(NSAnyEventMask, eventExpDate, NSDefaultRunLoopMode, true);
{$endif}
if Assigned(TCocoaApplication(NSApp).aloop) or Assigned(eventExpDate) then
event := nextEvent(eventExpDate)
else
event := nextEventBeforeRunLoop(eventExpDate);
if event <> nil then
begin
NSApp.sendEvent(event);