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

LazControls: Improve and optimize the filter controls. Issue #34057, patch from AlexeyT.

Browse Source 
git-svn-id: trunk@59225 -
This commit is contained in:
juha 2018-10-02 09:47:13 +00:00
parent 9dfe44db86
commit d6624128a1
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/lazcontrols/treefilteredit.pas
View File

@ -195,7 +195,7 @@ begin
for Origi:=0 to fOriginalData.Count-1 do begin for Origi:=0 to fOriginalData.Count-1 do begin
s:=fOriginalData[Origi]; s:=fOriginalData[Origi];
if (fOwner.Filter='') or if (fOwner.Filter='') or
fOwner.DoDefaultFilterItem(s,fOwner.Filter,nil) then begin fOwner.DoDefaultFilterItem(s,nil) then begin
i:=fSortedData.Count-1; i:=fSortedData.Count-1;
while i>=0 do begin while i>=0 do begin
if CompareFNs(s,fSortedData[i])>=0 then break; if CompareFNs(s,fSortedData[i])>=0 then break;

20
lcl/editbtn.pas
View File

@ -220,6 +220,7 @@ type
TCustomControlFilterEdit = class(TCustomEditButton) TCustomControlFilterEdit = class(TCustomEditButton)
private private
fFilter: string; fFilter: string;
fFilterLowercase: string;
fFilterOptions: TFilterStringOptions; fFilterOptions: TFilterStringOptions;
fIdleConnected: Boolean; fIdleConnected: Boolean;
fSortData: Boolean; // Data needs to be sorted. fSortData: Boolean; // Data needs to be sorted.
@ -237,8 +238,10 @@ type
fOnFilterItemEx: TFilterItemExEvent; fOnFilterItemEx: TFilterItemExEvent;
fOnCheckItem: TCheckItemEvent; fOnCheckItem: TCheckItemEvent;
procedure DestroyWnd; override; procedure DestroyWnd; override;
function DoDefaultFilterItem(const ACaption: string;
const ItemData: Pointer): Boolean; virtual;
function DoFilterItem(const ACaption, AFilter: string; function DoFilterItem(const ACaption, AFilter: string;
ItemData: Pointer): Boolean; ItemData: Pointer): Boolean; virtual;
procedure EditKeyDown(var Key: Word; Shift: TShiftState); override; procedure EditKeyDown(var Key: Word; Shift: TShiftState); override;
procedure EditChange; override; procedure EditChange; override;
procedure BuddyClick; override; procedure BuddyClick; override;
@ -256,8 +259,6 @@ type
public public
constructor Create(AOwner: TComponent); override; constructor Create(AOwner: TComponent); override;
destructor Destroy; override; destructor Destroy; override;
function DoDefaultFilterItem(const ACaption, AFilter: string;
const ItemData: Pointer): Boolean; virtual;
procedure InvalidateFilter; procedure InvalidateFilter;
procedure ResetFilter; procedure ResetFilter;
function ForceFilter(AFilter: String) : String; function ForceFilter(AFilter: String) : String;
@ -1135,18 +1136,18 @@ begin
inherited DestroyWnd; inherited DestroyWnd;
end; end;
function TCustomControlFilterEdit.DoDefaultFilterItem(const ACaption, function TCustomControlFilterEdit.DoDefaultFilterItem(const ACaption: string;
AFilter: string; const ItemData: Pointer): Boolean; const ItemData: Pointer): Boolean;
var var
NPos: integer; NPos: integer;
begin begin
if AFilter='' then if fFilter='' then
exit(True); exit(True);
if fsoCaseSensitive in fFilterOptions then if fsoCaseSensitive in fFilterOptions then
NPos := Pos(AFilter, ACaption) NPos := Pos(fFilter, ACaption)
else else
NPos := Pos(UTF8LowerCase(AFilter), UTF8LowerCase(ACaption)); NPos := Pos(fFilterLowercase, UTF8LowerCase(ACaption));
if fsoMatchOnlyAtStart in fFilterOptions then if fsoMatchOnlyAtStart in fFilterOptions then
Result := NPos=1 Result := NPos=1
@ -1172,7 +1173,7 @@ begin
// Filter by item's caption text if needed. // Filter by item's caption text if needed.
if not (Result or Done) then if not (Result or Done) then
Result := DoDefaultFilterItem(ACaption, AFilter, ItemData); Result := DoDefaultFilterItem(ACaption, ItemData);
end; end;
procedure TCustomControlFilterEdit.OnIdle(Sender: TObject; var Done: Boolean); procedure TCustomControlFilterEdit.OnIdle(Sender: TObject; var Done: Boolean);
@ -1190,6 +1191,7 @@ begin
if fFilter=AValue then if fFilter=AValue then
Exit; Exit;
fFilter:=AValue; fFilter:=AValue;
fFilterLowercase:=UTF8LowerCase(fFilter);
ApplyFilter; ApplyFilter;
end; end;