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

cocoa: adding a windowcontroller to NSAlert to process Escape key, even if there's no cancel button present on the dialog

Browse Source 
git-svn-id: trunk@59885 -
This commit is contained in:
dmitry 2018-12-21 05:05:24 +00:00
parent 54693c7dd9
commit a44e2a4d5d
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lcl/interfaces/cocoa/cocoalclintf.inc
View File

@ -163,6 +163,14 @@ begin
fClipboard.Sync;
end;
type
{ TCocoaAlertController }
TCocoaAlertController = objcclass(NSWindowController)
procedure keyUp(theEvent: NSEvent); override;
end;
{------------------------------------------------------------------------------
Func: CocoaPromptUser
Params: DialogCaption - Dialog caption
@ -200,6 +208,7 @@ var
I: Integer;
aButton: NSButton;
Str: string;
ctrl : TCocoaAlertController;
begin
{Str := 'TCocoaWidgetSet.PromptUser DialogCaption: ' + DialogCaption +
' DialogMessage: ' + DialogMessage + ' DialogType: ' + DbgS(DialogType) +
@ -272,7 +281,14 @@ begin
Result := 0;
end
else
Result := AnAlert.runModal;
begin
ctrl := TCocoaAlertController(TCocoaAlertController.alloc).initWithWindow(AnAlert.window);
try
Result := AnAlert.runModal;
finally
ctrl.release;
end;
end;
finally
informativeText.release;
messageText.release;
@ -285,7 +301,20 @@ begin
{$IFDEF VerboseLCLIntf}
DebugLn('TCocoaWidgetSet.PromptUser Result: ' + DbgS(Result));
{$ENDIF}
end; {TCocoaWidgetSet.PromptUser}
end;
{TCocoaWidgetSet.PromptUser}
{ TCocoaAlertController }
procedure TCocoaAlertController.keyUp(theEvent: NSEvent);
const
NSModalResponseCancel = NSCancelButton; // NSCancelButton is deprecated
begin
inherited keyUp(theEvent);
if theEvent.keyCode = kVK_Escape then
NSApplication(NSApp).stopModalWithCode(NSModalResponseCancel);
end;
{------------------------------------------------------------------------------
Method: PromptUser