pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

richmemo: updating search method to return the length of the found text (for cases, where found text could be different than a searched one. I.e. Hebrew or Arabic scripts)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5115 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
skalogryz
2016-08-31 15:59:03 +00:00
parent a53eb905c0
commit df60a80341
4 changed files with 71 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
components/richmemo/richmemo.pas
View File

@@ -250,7 +250,8 @@ type
procedure SetSelLengthFor(const aselstr: string);
function Search(const ANiddle: string; Start, Len: Integer; const SearchOpt: TSearchOptions): Integer;
function Search(const ANiddle: string; Start, Len: Integer; const SearchOpt: TSearchOptions): Integer; overload;
function Search(const ANiddle: string; Start, Len: Integer; const SearchOpt: TSearchOptions; var ATextStart, ATextLength: Integer): Boolean; overload;
function Print(const params: TPrintParams): Integer;
@@ -1050,6 +1051,15 @@ end;
function TCustomRichMemo.Search(const ANiddle: string; Start, Len: Integer;
const SearchOpt: TSearchOptions): Integer;
var
ln : Integer;
begin
ln := 0;
if not Search(ANiddle, Start, Len, SearchOpt, Result, ln) then Result:=-1;
end;
function TCustomRichMemo.Search(const ANiddle: string; Start, Len: Integer; const SearchOpt: TSearchOptions;
var ATextStart, ATextLength: Integer): Boolean; overload;
var
so : TIntSearchOpt;
begin
@@ -1058,9 +1068,17 @@ begin
so.len:=Len;
so.start:=Start;
so.options:=SearchOpt;
Result:=TWSCustomRichMemoClass(WidgetSetClass).Search(Self, ANiddle, so);
if not TWSCustomRichMemoClass(WidgetSetClass).isSearchEx then begin
ATextStart:=TWSCustomRichMemoClass(WidgetSetClass).Search(Self, ANiddle, so);
// not recommended. The text found coulbe longer than Niddle
// depending on the language and search options (to be done)
// mostly for Arabi and Hebrew languages
ATextLength:=UTF8Length(ANiddle);
end else begin
Result:=TWSCustomRichMemoClass(WidgetSetClass).SearchEx(Self, ANiddle, so, ATextStart, ATextLength);
end;
end else
Result:=-1;
Result:=false;
end;
function TCustomRichMemo.Print(const params: TPrintParams): Integer;