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

Cocoa: Fix #39997 #40115: wakeup event loop in TCocoaWidgetSet.AppWaitMessage()

Browse Source
This commit is contained in:
rich2014 2023-06-07 23:23:09 +08:00
parent 9e0d2e7371
commit 34ab4cb28a
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,6 +296,14 @@ uses
CocoaCaret, CocoaCaret,
CocoaThemes; CocoaThemes;
procedure wakeupEventLoop;
var
ev: NSevent;
begin
ev := NSEvent.otherEventWithType_location_modifierFlags_timestamp_windowNumber_context_subtype_data1_data2(NSApplicationDefined, NSZeroPoint, 0, 0, 0, nil, 0, 0, 0);
NSApp.postEvent_atStart(ev, false);
end;
function CocoaScrollBarSetScrollInfo(bar: TCocoaScrollBar; const ScrollInfo: TScrollInfo): Integer; function CocoaScrollBarSetScrollInfo(bar: TCocoaScrollBar; const ScrollInfo: TScrollInfo): Integer;
var var
pg : Integer; pg : Integer;
@ -651,6 +659,10 @@ begin
Result:=inherited nextEventMatchingMask_untilDate_inMode_dequeue(mask, Result:=inherited nextEventMatchingMask_untilDate_inMode_dequeue(mask,
expiration, mode, deqFlag); expiration, mode, deqFlag);
{$endif} {$endif}
if Result.type_ = NSApplicationDefined then
Result:= nil;
if not Assigned(Result) then if not Assigned(Result) then
begin begin
{$ifdef COCOALOOPNATIVE} {$ifdef COCOALOOPNATIVE}
@ -875,6 +887,8 @@ begin
ms.Free; ms.Free;
Modals.Delete(Modals.Count-1); Modals.Delete(Modals.Count-1);
wakeupEventLoop;
end; end;
function TCocoaWidgetSet.isTopModalWin(awin: NSWindow): Boolean; function TCocoaWidgetSet.isTopModalWin(awin: NSWindow): Boolean;