paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-22 11:19:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 59225-59226 #d6624128a1-#d6624128a1 from trunk:

Browse Source 
LazControls: Improve and optimize the filter controls. Issue #34057, patch from AlexeyT.
........
LazControls: Call DoFilterItem instead of DoDefaultFilterItem in TTreeFilterBranch.SortAndFilter.
........

git-svn-id: branches/fixes_2_0@59277 -
This commit is contained in:
maxim 2018-10-09 22:52:47 +00:00
parent 135c04027b
commit ad20e93541
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/lazcontrols/treefilteredit.pas
View File

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

20
lcl/editbtn.pas
View File

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