mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-05-07 07:32:45 +02:00
Cocoa: code related to ESC/ENTER in TCocoaFieldEditor removed by IME fully supported
This commit is contained in:
parent
773acf5b20
commit
fdbf58735b
@ -177,7 +177,6 @@ type
|
|||||||
// keyboard
|
// keyboard
|
||||||
procedure doCommandBySelector(aSelector: SEL); override;
|
procedure doCommandBySelector(aSelector: SEL); override;
|
||||||
procedure insertNewline(sender: id); override;
|
procedure insertNewline(sender: id); override;
|
||||||
procedure keyDown(event: NSEvent); override;
|
|
||||||
// mouse
|
// mouse
|
||||||
procedure mouseDown(event: NSEvent); override;
|
procedure mouseDown(event: NSEvent); override;
|
||||||
procedure mouseUp(event: NSEvent); override;
|
procedure mouseUp(event: NSEvent); override;
|
||||||
@ -805,24 +804,6 @@ begin
|
|||||||
// todo: find the reason for the endless loop and resolve it properly
|
// todo: find the reason for the endless loop and resolve it properly
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TCocoaFieldEditor.keyDown(event: NSEvent);
|
|
||||||
begin
|
|
||||||
// Input methods may capture Enter and Escape to accept/dismiss their popup
|
|
||||||
// windows. There isn't a way to detect the popup is open, so allow the
|
|
||||||
// keys through. If they make it to the default handlers let the LCL process
|
|
||||||
// them further. If they got swallowed prevent further processing.
|
|
||||||
if Assigned(lclGetCallback) and (event.modifierFlags = 0) and
|
|
||||||
((NSEventRawKeyChar(event) = #13) or (NSEventRawKeyChar(event) = #27)) then
|
|
||||||
begin
|
|
||||||
keyCaptured := True;
|
|
||||||
inherited keyDown(event);
|
|
||||||
if keyCaptured then
|
|
||||||
lclGetCallback.KeyEvHandled;
|
|
||||||
end
|
|
||||||
else
|
|
||||||
inherited keyDown(event);
|
|
||||||
end;
|
|
||||||
|
|
||||||
procedure TCocoaFieldEditor.mouseDown(event: NSEvent);
|
procedure TCocoaFieldEditor.mouseDown(event: NSEvent);
|
||||||
var
|
var
|
||||||
v : NSView;
|
v : NSView;
|
||||||
|
Loading…
Reference in New Issue
Block a user