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

Cocoa: fix the issue with abnormal parameters passed into Lookup Word from macOS

Browse Source
This commit is contained in:
rich2014 2024-09-03 21:30:54 +08:00
parent 3195a1ab46
commit 8f49ff3eaa
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lcl/interfaces/cocoa/cocoafullcontroledit.pas
View File

@ -426,21 +426,15 @@ var
lineText: NSString; lineText: NSString;
subRange: NSRange; subRange: NSRange;
begin begin
if (aRange.location=0) and (params.text='') then begin
params.text:= ' ';
textWord:= NSSTR( ' ' );
Exit;
end;
lineText:= StrToNSString( params.text ); lineText:= StrToNSString( params.text );
subRange.location:= params.col; subRange.location:= params.col;
subRange.length:= aRange.length; subRange.length:= aRange.length;
if subRange.location + subRange.length > lineText.length then begin if subRange.location >= lineText.length then begin
if lineText.length > subRange.location then textWord:= NSSTR( ' ' );
subRange.length:= lineText.length - subRange.location Exit;
else
subRange.length:= 0;
end; end;
if subRange.location + subRange.length > lineText.length then
subRange.length:= lineText.length - subRange.location;
textWord:= lineText.substringWithRange( subRange ); textWord:= lineText.substringWithRange( subRange );
end; end;
@ -463,6 +457,7 @@ var
procedure setActualRange; procedure setActualRange;
begin begin
if aRange.location >= (LW_LOCATION_BASE/2) then begin if aRange.location >= (LW_LOCATION_BASE/2) then begin
params.length:= textWord.length;
actualRange^:= LWParamsToRange( params ); actualRange^:= LWParamsToRange( params );
end else begin end else begin
actualRange^.location:= aRange.location; actualRange^.location:= aRange.location;