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

LazControls: Improve ListFilterEdit to be used in "View Project Units".

Browse Source
This commit is contained in:
Juha 2022-01-25 16:57:40 +02:00
parent b22acaab2e
commit c0aab03941
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
components/lazcontrols/listfilteredit.pas
View File

@ -35,6 +35,7 @@ type
fSelectionList: TStringList; // Store/restore the old selections here. fSelectionList: TStringList; // Store/restore the old selections here.
// Data supplied by caller through Data property. // Data supplied by caller through Data property.
fOriginalData: TStringList; fOriginalData: TStringList;
fSimpleSelection: boolean;
// Data sorted for viewing. // Data sorted for viewing.
fSortedData: TStringList; fSortedData: TStringList;
fCheckedItems: TStringMap; // Only needed for TCheckListBox fCheckedItems: TStringMap; // Only needed for TCheckListBox
@ -62,6 +63,7 @@ type
procedure StoreSelection; override; procedure StoreSelection; override;
procedure RestoreSelection; override; procedure RestoreSelection; override;
public public
property SimpleSelection: boolean read fSimpleSelection write fSimpleSelection;
property SelectionList: TStringList read fSelectionList; property SelectionList: TStringList read fSelectionList;
property Items: TStringList read fOriginalData; property Items: TStringList read fOriginalData;
published published
@ -213,6 +215,18 @@ begin
end; end;
end; end;
fFilteredListbox.Items.EndUpdate; fFilteredListbox.Items.EndUpdate;
if FSimpleSelection and (fSortedData.Count > 0) then begin
if (Text<>'') then begin
MoveTo(0, true);
end else begin
for i:=0 to fSortedData.Count-1 do
if PtrInt(fSortedData.Objects[i]) and 1 > 0 then begin
MoveTo(i, false);
MoveTo(i, true);
Break;
end;
end;
end;
end; end;
procedure TListFilterEdit.StoreSelection; procedure TListFilterEdit.StoreSelection;
@ -221,6 +235,8 @@ var
begin begin
if fFilteredListbox = nil then if fFilteredListbox = nil then
exit; exit;
if fFilteredListbox.SelCount > 1 then
FSimpleSelection := false;
fSelectionList.Clear; fSelectionList.Clear;
if fFilteredListbox.SelCount > 0 then if fFilteredListbox.SelCount > 0 then
for i := 0 to fFilteredListbox.Count-1 do for i := 0 to fFilteredListbox.Count-1 do
@ -233,6 +249,8 @@ var
i: Integer; i: Integer;
clb: TCustomCheckListBox; clb: TCustomCheckListBox;
begin begin
if FSimpleSelection then
Exit;
if fSelectionList.Count > 0 then if fSelectionList.Count > 0 then
for i := 0 to fFilteredListbox.Count-1 do for i := 0 to fFilteredListbox.Count-1 do
if fSelectionList.IndexOf(fFilteredListbox.Items[i]) > -1 then if fSelectionList.IndexOf(fFilteredListbox.Items[i]) > -1 then
@ -317,22 +335,22 @@ begin
fFilteredListbox.ItemIndex := AIndex; fFilteredListbox.ItemIndex := AIndex;
for i := Min(AIndex+1, xSelStart+1) to Max(AIndex-1, xSelEnd-1) do for i := Min(AIndex+1, xSelStart+1) to Max(AIndex-1, xSelEnd-1) do
fFilteredListbox.Selected[i] := True; fFilteredListbox.Selected[i] := True;
//Win32 sets ItemIndex to the last Selected[?] := True - in contrast to Gtk2 -> set selected again to work on all widgetsets // Win32 sets ItemIndex to the last Selected[?] := True
// - in contrast to Gtk2 -> set selected again to work on all widgetsets
fFilteredListbox.Selected[AIndex] := True; fFilteredListbox.Selected[AIndex] := True;
end else end else
begin begin
fFilteredListbox.ItemIndex := AIndex; fFilteredListbox.ItemIndex := AIndex;
fFilteredListbox.Selected[AIndex] := True; fFilteredListbox.Selected[AIndex] := True;
end; end;
Assert(fFilteredListbox.ItemFullyVisible(AIndex), 'TListFilterEdit.MoveTo: Item not fully visible'); if not fFilteredListbox.ItemFullyVisible(AIndex) then
{ if not fFilteredListbox.ItemFullyVisible(AIndex) then
begin begin
if fFilteredListbox.TopIndex < AIndex then if fFilteredListbox.TopIndex < AIndex then
fFilteredListbox.TopIndex := AIndex - Pred(fFilteredListbox.ClientHeight div fFilteredListbox.ItemHeight) // was: Pred(fFilteredListbox.ClientHeight div fFilteredListbox.ItemHeight)
fFilteredListbox.TopIndex := AIndex - 5 //but ItemHeight can be 0. Use const 5.
else else
fFilteredListbox.TopIndex := AIndex; fFilteredListbox.TopIndex := AIndex;
end; end;
}
finally finally
fFilteredListbox.UnlockSelectionChange; fFilteredListbox.UnlockSelectionChange;
fFilteredListbox.Items.EndUpdate; fFilteredListbox.Items.EndUpdate;